Correctly scope loop filters.  Fixes #649
5 files changed