Discontinue words as fixed tokens ('if', 'else' etc) and use ID's instead.

Fixes #1259