Improve SQL.Do bind variable handling