Tested and enabled macro expansions.