Change CP to use labelled sums and choices (although 1 and top are still
around); start translation from GV to CP (although it's still broken).