Some missing  refactorings backported from B+tree branch