Fix SF bug [ #476852 ] Some bad macros in abstract.h
Fix SF bug [ #476852 ] Some bad macros in abstract.h

Change macros as requested by Guido

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