Added subst_args_in_body in VMacro, and some unittests.

Still not correct in OPreProcess though - seeing duplicate strings.