Move more simple things to the select-among-alternatives model