Finish message conversion -- phew

Checks for messages are too hard however, they need to be unified.

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>