Refactoring, adding Token.Name.Tag to syntax plugin.