Make more use of the CompileTokens() macro.
Replace always true test with assertion.
rebase