Forgot to mention... the changes are on my fork, at https://github.com/sebersole/hibernate-core/tree/HHH-11356