A bit of work on the counter utils.