For now, it's just a code deduplication. But the goal is to swap string lists with models that have separate value and display roles. (cherry picked from commit 114ea905)