Target lost if macro takes arguments

[bdarnell]

expand_if_in_registry calls itself recursively when a macro is used with arguments, but it doesn't preserve **kwargs. This means that you cannot use both args and target at the same time (i.e. with mymacro(x) as y:)