Apply suggestions from code review · rust-lang/rust@9f1ad43