Select: small code improvement, seems to make the tests happy.