LPS-22792 Simplifies selector logic