Add a `clock` argument everywhere