Changed uses of NHol's Choice.succeed to ExtCore's Choice.result.