General improvements to typing of selection and choice session types.