Clean support for multiple messages.  Update the messages.