Clean up and added new simple message type support.