Eliminate duplicate case statements added in previous commit (some of these were already mapped using numeric constants).