Avoid running empty for loops; fixes trac #3683