Cleanup code that handles predicate declaration and definition lines and clause numbers