Strip trailing underscore from option names

[djpohly]

Removes a trailing underscore from function argument names when inferring option names, to avoid name clashes with reserved words and builtins (e.g. --class or --all). Implements #222.

[djpohly]

(After some further testing, it looks like there are other places where the mapping needs to be adjusted, so this is a draft for now.)