Remove some inline uses of Choice.get.