Eliminate NonTerminalId in favor of Strings.