Protect against change in API for group-by.