Started with a follow-up to fa9b2f97, which missed applying the fix to docs, and then added some more while reading it.
fa9b2f97