removing errant underscores from terminal and non-terminals, as per Hellman.