Bug 20600: (follow-up) Do not use $_ in loop