And preparatory cosmetic "make it explicit" patch because, while working on this, I found the existing logic confusing.
