ASMPrototype: Adapting changes from AnnotationEditor
Clean up of ASMAnnotationConverter
ASMPrototype: Adapting changes from Annotation Editor
Bug fixing and clean up.
Clean up.