Tweak inspection rules some more, reduce inversions