Remove checks for multiple token types
Match a range of tokens
Match a single token against a choice of token types
Change project path