More refactoring to use the H2O connection object.