More complete macros with some structures move entirely to them