Item12853: correct scope problems idenitified by perlcritic. No functional change, as confirmed by George's unit test

git-svn-id: http://svn.foswiki.org/trunk@17521 0b4bb1d4-4e5a-0410-9cc4-b2b747904278