Fixes for rustc master.
Merge pull request #36 from dcbishop/fixes-14apr2014

Fixes for rustc master.