Replaced Choice1Of2 and Choice2Of2 with type aliases.