Fixed remaining regressions (i hope)
Removed btreeNodeProxy->enumerate
Code cleanups, no functional changes