Ok, created [METAGEN-96](https://hibernate.atlassian.net/browse/METAGEN-96) for this.