Added scanning for parameter annotations. Minor refactoring of method names.