More consistent wrap-around checking for accumulators