Fixing a severe bug in PhabricatorMacroQuery

Summary: Just look at it for yourself

Test Plan: Fixed some fatals in a future diff

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D5420