Compatibility for latest rustc nightly

Enum namespacing and numeric reorganization