Fix bugs in: handling of nullable types, mapping of classes themselves in MapTypes, and in building of ConstructorAnnotations strings