Renamed "expr" argument to "ast" in macros.