Fix enumeration of option values.