Remove some clutter in Tstamp calculations.