Also replaced compiler macros used by S2.