Handle more cases with parse_message.