Type corrections for iota and map/set/seq comprehensions
Changes to allow type constraints for statements