Some minor cleanups to SearchQueryParser.