Addressing post-review comments in r185756.