TS-1728: Make some small cleanup as suggested.
TS-1728: Make compile without C++11