modified the iteration constructs so loop does not leak through

Previously (up i 1 10 (print i) collect i) would expand into
(loop for i from 1 to 10 do (print i) collect i). Now the code
is no longer valid.