A few tweaks for issue16662 based on feedback from Robert Collins.