More cleanup of the plugin API.