More clean-up of the messaging system.