Reorganized remaining message handlers in datatypes.