Add more type aliases.  Allow explicit choice specification.