Corrected the serialization.
Extract and correct the semantic annotation parsing code.
Look in more properties for things to use for types, and provide a
fallback subject.