Make enum variants part of both the type and value namespaces.
Merge remote-tracking branch 'nrc/variants-namespace'
61