Macro subst ast cloning fixes