Some consistency changes to counting and histogram implementations.