FIX #2327: a fault in the thunk-selector machinery (again)