Refactor: add ChoiceStrategy (with default for expanding all)