Handling remaining questionable cases of disabling WF on commit