language-selection: Changes from code review