More uses of CodegenUtils, more cleanup