Fix layout test regressions from r94352.