[C++ PB perf]: incorporate changes suggested by #128