Simplify SemanticData subobject serializer/deserializer

Change-Id: Ia007ed92ef938d277179c56f7f903995c3561795