Make adjustments for the simplified `iteratorTemplate`.
Remove unneeded `window` var special case.