More work on Annotation Set serialization (in progress)