Made TimespanMaker more robust.