Revert "Drop requirement for user code to call CBase_foo::pup(p)"