Adjust for Binding RPC codegen changes