Further JDBC type cleanup