Avoid changing opts when not necessary, one-line a few more ifs, throw a PluginError #6