Updated code/macros to be compliant with the current HEAD (from Y. Belikov)

No match.