Minor cleanup for proto_register & proto_reg_handoff ...