Also use mori for choices

Now there's no _.clone in resolver.js!