Added markers for tracking macro expansions.