Code style changes on the Windows plug-in importer.
Other small changes