added call_macro to scope and fixed lambda binding issues