Less insane message parsing