Address PR feedback, fix MultiChoiceSetting.contains
Make MultiChoiceSetting.compute easier to understand