Ability to record withdrawn enrolments as 'completed' or 'cancelled' without having to change NYS unit outcomes

It would be great if we could change an enrolment status for a withdrawn student to 'cancelled' or 'completed' without having to change any NYS unit outcomes to anther outcome first, then changing them back once the status has updated. This leaves a lot of room for error and under Smart and Skilled we need to report all outcomes including NYS so these need to remain.