Cleaned up CBNFParser::CNonTerminal::Match()