Bring event message parsing in line with the spec.