Cleanup of equality rewriting and no swapInsts for wanteds