(Arithmetic) Minor modifications and add a new TopCounter.