Cleaned up ParserOptions a bit