Update pb-to-cpp.uc

Several small fixes