Merge "Structure layout logic cleanup."