Addressing post-review comments on r191934.