Move more sql construction responsibilities into the DV handlers

Didn't we discussed that we want to get rid of these two "equality" methods?