Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: RalfJung <9b466094ec991a03cb95c489c19c4d75635f0ae5@ralfj.de>
graydon/rust,aidancully/rust,graydon/rust,aidancully/rust,aidancully/rust,aidancully/rust,graydon/rust,graydon/rust,graydon/rust,aidancully/rust,aidancully/rust,graydon/rust