29cfda6 Cleanup GrantType and TokenType.