Enum scoping fixes.
Merge pull request #134 from servo/rustup_20141124

Enum scoping fixes.