Found a few more places where timestamp code could be simplyfied