A few opportunities for improvement I noticed while reviewing recent MRs. See commit messages for details.