Implement post-review comments for r216730

Feedback was 'this could use better comments'.