Changes to be more inline with the proposed guava rangeset api