Performance change to SignalPicker
using less objc is slightly clearer / more performant