3.1 compat: changing control blocks for loop