Delete choice refactor

@kenearley @stof 

This refactors the ``choice_build`` method to remove the dependence on container ids. This is better for a myriad of reasons but most notably when working with Chosen in memory.

Fixes #1230