In RecognizedOptions, javac has lists of options that are valid for the tool API, the standard file manager, and for the command line. The command line options are a superset of the other two sets, and would be better derived as such.

command-line options =
tool options
+ file manager options
+ FULLVERSION, HELP, J, VERSION, X, XSTDOUT

This would mean that new options have to be added in only one list, and not two, as is the case now.