Re-introduce the use of util.assemble_timerange.  It got lost in a rebase.