Replace foldl with foldl'.
Consolidate token definitions.