Plugins: cosmetics See #286