Move even more state into LayoutFinder.