Code modernisation and tweaks to drive-eject warning alert.