change version and help macros to be less greedy.

This was preventing any input option that began with either -v or
-h