BTW, I don't know how this slipped through the cracks,
but now I checked again, and found more occurrences
to fix on master: