Does it make sense to also reset `first_batch_at` here? @bjori was asking me yesterday about what happens to the `first_batch_*` values after we're outside of that batch.