Cleanup code that does predicate clause number counts