Fix more breakage similar to rust-lang/rust#36340 and 11f118643#223

Merged

sfackler merged 1 commit intosfackler:masterfrom

faradayio:another-unknown-type

Nov 30, 2016

Commits on Nov 30, 2016

Fix more breakage similar to rust-lang/rust#36340 and 11f118643
emk
committed