Cleanup in message.py.