biggish Block queue reshuffle, Planner::recalculate() still has off-by-one errors