Removing a plethora of shortopts in an attempt to achieve consistency