Towards removing iteration spaces from wrapper