Minor cleaup of count handling