1.8.0

Apply 1.8.0's fixes to the use of push_macro & pop_macro