Merge "Quick: Fix code layout pass; don't terminate too early."