Removed type-only iteration variables