Fixes for Rust RFC #390.
Merge pull request #18 from mrmonday/enum-fixes

Fixes for Rust RFC #390.