Changes to accomodate refactoring in java-driver.