Unresolved nits on PR #1086 (which will already have been merged) #1087

Leftover nits from PR #1086 (merged).

See unresolved / outdated review threads on that PR.
Not blocking; do in a follow-up.

You may need to expand “Show outdated” in the closed PR in order to read all of the details.