Incorporate code review feedback from @hadley