Cleanup message class versus target class in parsing.