This is done as much as currently possible as a grouping of work. I’ll do some more work on this under https://hibernate.atlassian.net/browse/HHH-16357 and a lot more opportunity opens up as we work through the changes to building the metamodel