The only other option I can see would be to consider changing EnumType to implement Type, rather than UserType. But at that would only be fixed for subsequent 5.2.x releases I am not sure it is worth the effort.