Simplify PluginVisitor