Update to new rust. Use new namespaced Enum variants.
Fix compile warnings.