replaced double underscore as new standard way of writing the dummy annotation for onX instead of single underscore, which emits warnings on javac8+.

Also made dollars and Xes legal in addition to underscores, in case double underscore disappears later too.