Work around https://github.com/mozilla/rust/issues/8753 for now.
Fix compile errors.