Starting to implement the elaborator.

Forgot about the ':' token.
Simplify identifer/literal tokens to just terminals.