SF bug #1001088, incorrect reference to macro named foo
SF bug #1001088, incorrect reference to macro named foo

Backport candidate.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator