Update the repeat and surround plugins, and make them bundles.