Updating: handling if-expressions in a macdef.