I've sent an updated patchset with simplifications and including other messages. I'll send the message tests and static control tests after that, since they're only tangentially related. Regards, Fabian Maurer