Improved dealing with annotated fields & methods.