It's been only about 20 years, but better late than never. 1: drop function pointer parameter from macro_init() 2: isolate macro_strip_at to macro.c 3: use flag_mri directly in macro processing 4: expose flag_macro_alternate globally Jan