Fix macro breakage in previous commit