Make more use of the CompileTokens() macro.
merge trunk