Fix scoping for method injection; prelim testing