[FLAPI-114] refactor
[FLAPI-114] a small change to prevent @Deprecated from ending up as a
user parameter, since we would prefer that the code path specifically for
deprecation is used

Also moves the setting of the annotation to the 'finish' method, to be more
in line with some of the other helpers