Cleanup a bit semantic layout API

[#63386470]