Not perfect yet (what if definitions change during the same transaction ?),
but better than previous state.