Change the more recently added "choice" functions to conform to the coding style used throughout the rest of the file.
Change the more recently added "choice" functions to conform to the
coding style used throughout the rest of the file.

ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,nmav/nss,ekr/nss-old,ekr/nss-old,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,nmav/nss,ekr/nss-old,nmav/nss