Remove more duplication.
s/non-terminal/nonterminal/