Fixed messages to be defined with macros.