Minor cleanup mostly related to proto_reg_handoff