Merge typo fixes (and the fix for #8401 that I wrongly merged) with 3.3.