Fixed tokenizer to handle backticks and macro back-slashes properly
Reshuffle after tokenizer fix on wrong branch