Synchronise the VMS build with recent movements in the Unix build.