Well it turns out you’re incredibly blessed that I was bored this morning, and I fixed all the miscellaneous issues with this here:

https://github.com/hibernate/hibernate-orm/pull/5344