* commit 'eda35cb7c5781a32b038f1ef76b8e50f26f9bfaf': Clean up (some of) our many clocks to use H instead of k.