Restore VMS build after e205153210.
Also fix wince for caretx after e2051532106.