Update for the new layout analyzer.