Including feedback from Chet's code review