Also make some invariants cleaner

git-svn-id: file:///svn/toku/tokudb@45075 c7de825b-a66e-492c-adef-691d508d4ae1