Moved custom command-line parsing code out of optionparser.h