A little bit of cleaning in smoothsql utils.