Addressing post-review comments after r196747.