Tweak + test for 'naked for's