reorder macro calls