Fixed stuff I broke while refactoting OptionsParser.