Minor refactoring, standard annotations now limited in choice.