Bring statement-modifying for in line with spec.

It now sinks at statement level also.
Fix combinations implementation's use of for.