TS-1728: Make some small cleanup as suggested, but don't introduce
C++11 only code this time.