Also: minor cleanup related to proto_reg_handoff svn path=/trunk/; revision=26197
svn path=/trunk/; revision=18196
svn path=/trunk/; revision=17808