Considerable simplification of the installer.