Fix enum namespace-edness

Update to newest rustc where enum variants are now namespaced under their type.