Feedback from nim's review of be4d306.