Slightly refactored UnitSelect.