A bit more cleanup of the install procedure.