disposeWhen occurs *before* re-evaulation

Closes #1585 

P.S. I don't know why it picked up the other addition/deletion as I never changed that line (on any of my 3 pull requests for this)!