Further work on messages (WIP).