Update for latest rustc master

Enum values are now namespaced, and have had their variant names altered
to compensate.