Yeah, I've been using the name expression throughout these changes since it makes the destructuring work. I'm fine renaming to condition and remove the destructuring.