Yup - just one more call to select() that we need to convert, when Jimis's patch eventually lands ...