Add basic support for divert
fix empty strings
support nested parens in macro arguments