Fix code generation issues with latest version of alloy.