Sorry about that, apparently I don't get alerts on intermediate pushes, only on your comments.

I think this line contains the last case of Timer.

Can you send another comment after the branch compiles? The rest of the changes including ensureClockSync() look good.

Thanks!
-k