TicketQuery: refactor `expand_macro` to clean-up its code layout after recent changes
Authored by: cboos 2008-04-29
Parent: [r6911]
Child: [r6913]