Addressing post-review comments on r201635.