remove spurious references to mWhen and replace with when