Fix using accessors names where the original option used hyphens
Move some post-processing option handling into the getopt module
Swap around some of the short options