Bugfixing and cleanup for LLRB tree