Fix #2586, bug in THUNK_SELECTORs (again)