Some work on message defines.