Previously, both fMethodsForAnnotations and fMethodsForAnnotations referenced unmodifiable maps. Is there a reason why you changed them to reference the raw modifiable maps?