some progress with undoing macro expansions