cleanup: fix possible overflow errors in binary search, part 2