layout: Consolidate passes in the sequential path that were consolidated

in the parallel path.

r? @larsbergstrom