Expose the clock combinator + various clean-ups