Improve enum implementation.