Don't remove second where if already less than two.
Slight fixes to eager loading where removal.
Emulate transaction nesting.