OPT: Make Buffer shift explicit in C++

OPT: Make Buffer shift explicit in C++ #755