Fix assembly/disassembly of deeply nested annotations, assembly of AnnotationDefaults