Closer mirror to C++ code for message types