r233: Tidied up choices.c quite a lot. Also, replaced the 'guess' file with a