We don't typically have these (see message type, etc.) and removing them will allow simplifying the code. (imported from commit fbefb08ee9b08c73f32c8150a6fa1060957aa8ad)