Address post-review feedback after r238438