More code cleanup; more annotations; more CodegenUtils usages.