Rewire BundleFeatureLocator to use composition over inheritance