Continuing refactoring of dropdown.