This message header stuff is just silly
Remove ugly 'node-state' pattern