WYIL/WYCS: making progress fixing up broken for-loops.