Improve the grammar of VariableCharacters and TypeCharacters.

The grammars were improved by using the WORD grammar, instead of
multiple repetitions of individual grammars (VariableCharacter and
TypeCharacter, respectively).