removed _is_macro warnings