Make entries on etypecase/ctypecase and ecase/ccase more consistent