Unbundled some more plugins.