r21002: Get rid of unused macros - merge change from 3_0_24