Enumeration parsing is still broken despite your patches. I've add comment to your commit about this.