Hi Keven,

in this patch I have tried to implement some sanity checking so that there
cannot happen what happened.

Unfortunately it has many regression in normal testcases, it would need to be
tuned more.  But IMO it would be worth to implement some such checks, it is
easy to forget calling some dynamic-resolve.


Thanks,
Jan