Simplify handling of string literals
Check array case choices cover all possible values