ValidAlign
Since it looks like there won't be any reverts needed in `Layout`, finish off this change.