[3757cdf808] More clock refactoring with spooky impact on [string match]
performance.