Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Amanieu d'Antras <92db609b8007e8ad5e633f1530d9df21d90665f4@gmail.com>
graydon/rust,aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,graydon/rust,aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,aidancully/rust,aidancully/rust