Refactor Invoker to treat target as regular placeholder