Clean up the handling of UUIDs in the JDBC model