Update for namespaced enums.

I tend to be more conservative about changes made along with rustups; they are usually big enough on their own.