Thanks for the provided test case, this really helps. Now I think this will require a bit more time than expected to figure out how to best address this.
I'll be off at Devoxx the entirety of next week. I may be able to look into things there, but my schedule is pretty busy.
Anyways, just a heads up: am looking into this, but expect slow progress for the 10 days to come.