Fix two regressions introduced by #11072.

There, concrete evidence that I shouldn't try doing such things at 1:30am.
auto merge of #11079 : chris-morgan/rust/fix-11072-regressions, r=brson

(#11072)

There, concrete evidence that I shouldn't try doing such things at 1:30am.