Installer OSX: Streamline device enumeration and fix the #endif position to actually list the devices coming from the enumeration.