Update for new injector API
Prepare for `xctools`