Improvements to the plugin system.