Thanks for spotting that Joshua Swoyer , looks like Andrea Boriero jumped on it and made a proposal here: https://github.com/hibernate/hibernate-orm/pull/6927

Feel free to comment there, try it out and/or suggest further improvements 🙂