Switched findWithDefault and lookupLT and friends to use the new branching calculation