TS-1728: Make some small cleanup as suggested.