r2059: cleanup sql-escape* functions