Add support for mapping multiple keywords to the same constant in enumeration/value. Remove commented out stuff.