Bring VMS in sync with the recent changes.