CGE2: Add a virtual destructor in Choice, some minor cleanup