i see the point. if this is the only point where we have an issue then that should really not make us change everything again. the code below is clean, not a hack. just a bit deep in the internals of doctrine. but these things are unlikely to change.