Further work on message type handling.