Hopefully make the message code a lot more stable.