fix the WS-only complaints all going into the last file

for loops seem to have some really weird scoping rules.

Change-Id: I23d0ee41fb9035545b483c60ad71a9eda50d59b6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>