Cleaned up the PluginAccessor code.