Merge "Remove math specific code from ParserOptions"