Also fix ordering of count and time elsewhere

For consistency’s sake.