I already coded the "better" solution: https://github.com/sebersole/hibernate-core/tree/HHH-9602

Was just waiting to see if we heard back from Dionis Argiri