Fix some rightward drift.

(No semantic change.)
Update for mozilla/rust#10796.