Add support for methods that return arguments.   Add support for removal of injection and re-injection