As per 10472, mvanbaak thought the generated code would look better this way.