Rename choice to Choose and get rid of some cruft.