Fix some minor problems.
Fix some minor problems.

Make the table of attribute information contain only one kind of
entry.  Simplifies some stuff in subconvert().

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator