Move remaining selection mode logic into selextend