Tidy up some of the plugin list stuff...