Preliminary updates for JDBC4 support.