Follow-up r77796: a couple of typos in the comment, and break more consistently at...