Fix few macros to work with the corrected declarations.