Make option constants enumerable again