Minor fixes for issues raised in https://github.com/mozilla/rust/pull/14017