Modified tokeniser and macros