It is only used by unit tests, so probably not that big of a deal. Also, there are a lot of similar "count" getters used in the same way. If we do change it, we should change them all.