Update imports for namespaced enum variant changes
Merge pull request #69 from ebfe/fix-build-master

Fix build with rust master