disposeWhen occurs *before* re-evaulation

Closes #1585