Mimic approach of other queries to pass context. No need for reference to macro node in query object any longer.