Well, I was working on a version where I don't have to rewrite the entire command just do add things to it, but I ran into a snag: I won't be able to get the originally targeted player anymore. I had to choose between writing an entire bot script for it, having it look via simple, breakable checks, or hooking it into Bot Events. If I work on it at all, I suppose I'll just make it stand there for a moment and disappear.
But my point is it still does what it does. It just adds something, which that part shouldn't count.