Fix non-brace delimeters in nested macro formatting

[jkelleyrtp]

Fix #2806

We were only looking for brace macro replacements which doesn't work if you have non-brace delimiters for your macro.

Now we just transform all nested rsx!() calls to rsx!{}