Clock: Rework clocks to avoid tick-to-cycle transformations