Merge pull request #241 from dtolnay/token

Token macros