Address post-review comments after r237955