Further countOnly simplification and brittleness reduction