Since the current implementation uses the key in token_enum I would have to re-stub the current implementation in order to split the second commit. Would this be a good idea?
No, that would cause a regression.
Couldn't you add the changes to `TokenEnumBuilder` without changing `token_category_EnumTokens()` in the first instance?