Small improvement to round counting