Messages: merge macros with and without message code