disposeWhen occurs *after* re-evaulation

Closes #1585