Add default: abort(); cases to two more switches.