diff --git a/servers/slapd/back-sql/add.c b/servers/slapd/back-sql/add.c
index d93b57a438..0a143b7a7f 100644
--- a/servers/slapd/back-sql/add.c
+++ b/servers/slapd/back-sql/add.c
@@ -193,7 +193,7 @@ backsql_modify_delete_all_values(
 				"   backsql_modify_delete_all_values() "
 				"arg(%d)=" BACKSQL_IDFMT "\n",
 				pno + 1 + po,
-				BACKSQL_IDARG(e_id->eid_keyval), 0 );
+				BACKSQL_IDARG(e_id->eid_keyval) );
 
 			/*
 			 * check for syntax needed here 
@@ -475,7 +475,7 @@ add_only:;
 					"   backsql_modify_internal(): "
 					"arg(%d)=" BACKSQL_IDFMT "\n", 
 					pno + 1 + po,
-					BACKSQL_IDARG(e_id->eid_keyval), 0 );
+					BACKSQL_IDARG(e_id->eid_keyval) );
 
 				/*
 				 * check for syntax needed here
@@ -633,7 +633,7 @@ add_only:;
 					"   backsql_modify_internal(): "
 					"arg(%d)=" BACKSQL_IDFMT "\n", 
 					pno + 1 + po,
-					BACKSQL_IDARG(e_id->eid_keyval), 0 );
+					BACKSQL_IDARG(e_id->eid_keyval) );
 
 				/*
 				 * check for syntax needed here 
@@ -1306,7 +1306,7 @@ backsql_add( Operation *op, SlapReply *rs )
 
 	Debug( LDAP_DEBUG_TRACE, "   backsql_add(\"%s\"): "
 		"create_proc returned keyval=" BACKSQL_IDNUMFMT "\n",
-		op->ora_e->e_name.bv_val, new_keyval, 0 );
+		op->ora_e->e_name.bv_val, new_keyval );
 
 	rc = backsql_Prepare( dbh, &sth, bi->sql_insentry_stmt, 0 );
 	if ( rc != SQL_SUCCESS ) {
diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c
index 6f148e24e4..8f885ef995 100644
--- a/servers/slapd/back-sql/entry-id.c
+++ b/servers/slapd/back-sql/entry-id.c
@@ -690,7 +690,7 @@ backsql_get_attr_vals( void *v_at, void *v_bsi )
 #ifdef BACKSQL_TRACE
 	Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_vals(): "
 		"query=\"%s\" keyval=" BACKSQL_IDFMT "\n", at->bam_query,
-		BACKSQL_IDARG(bsi->bsi_c_eid->eid_keyval), 0 );
+		BACKSQL_IDARG(bsi->bsi_c_eid->eid_keyval) );
 #endif /* BACKSQL_TRACE */
 
 	rc = SQLExecute( sth );
diff --git a/servers/slapd/back-sql/modify.c b/servers/slapd/back-sql/modify.c
index 046b8a425b..05dc9e05b7 100644
--- a/servers/slapd/back-sql/modify.c
+++ b/servers/slapd/back-sql/modify.c
@@ -103,7 +103,7 @@ backsql_modify( Operation *op, SlapReply *rs )
 	Debug( LDAP_DEBUG_TRACE, "   backsql_modify(): "
 		"modifying entry \"%s\" (id=" BACKSQL_IDFMT ")\n", 
 		bsi.bsi_base_id.eid_dn.bv_val,
-		BACKSQL_IDARG(bsi.bsi_base_id.eid_id), 0 );
+		BACKSQL_IDARG(bsi.bsi_base_id.eid_id) );
 
 	if ( get_assert( op ) &&
 			( test_filter( op, &m, get_assertion( op ) )
diff --git a/servers/slapd/back-sql/modrdn.c b/servers/slapd/back-sql/modrdn.c
index 72f439d7d1..0e76ba459a 100644
--- a/servers/slapd/back-sql/modrdn.c
+++ b/servers/slapd/back-sql/modrdn.c
@@ -107,7 +107,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
 
 	Debug( LDAP_DEBUG_TRACE,
 		"   backsql_modrdn(): entry id=" BACKSQL_IDFMT "\n",
-		BACKSQL_IDARG(e_id.eid_id), 0, 0 );
+		BACKSQL_IDARG(e_id.eid_id) );
 
 	if ( get_assert( op ) &&
 			( test_filter( op, &r, get_assertion( op ) )
@@ -167,7 +167,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
 
 	Debug( LDAP_DEBUG_TRACE,
 		"   backsql_modrdn(): old parent entry id is " BACKSQL_IDFMT "\n",
-		BACKSQL_IDARG(bsi.bsi_base_id.eid_id), 0, 0 );
+		BACKSQL_IDARG(bsi.bsi_base_id.eid_id) );
 
 	if ( rs->sr_err != LDAP_SUCCESS ) {
 		Debug( LDAP_DEBUG_TRACE, "backsql_modrdn(): "
@@ -222,7 +222,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
 
 		Debug( LDAP_DEBUG_TRACE,
 			"   backsql_modrdn(): new parent entry id=" BACKSQL_IDFMT "\n",
-			BACKSQL_IDARG(n_id.eid_id), 0, 0 );
+			BACKSQL_IDARG(n_id.eid_id) );
 
 		if ( !access_allowed( op, &n, slap_schema.si_ad_children, 
 					NULL, ACL_WADD, NULL ) ) {
diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c
index 7ee13cb719..9a296c66b6 100644
--- a/servers/slapd/back-sql/search.c
+++ b/servers/slapd/back-sql/search.c
@@ -1746,7 +1746,7 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi )
 	}
 	
 	Debug( LDAP_DEBUG_TRACE, "id: '" BACKSQL_IDNUMFMT "'\n",
-		bsi->bsi_oc->bom_id, 0, 0 );
+		bsi->bsi_oc->bom_id );
 
 	rc = backsql_BindParamNumID( sth, 1, SQL_PARAM_INPUT,
 			&bsi->bsi_oc->bom_id );
@@ -1883,7 +1883,7 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi )
 		assert( !BER_BVISNULL( &bsi->bsi_base_id.eid_ndn ) );
 
 		Debug( LDAP_DEBUG_TRACE, "(one)id=" BACKSQL_IDFMT "\n",
-			BACKSQL_IDARG(bsi->bsi_base_id.eid_id), 0, 0 );
+			BACKSQL_IDARG(bsi->bsi_base_id.eid_id) );
 		rc = backsql_BindParamID( sth, 2, SQL_PARAM_INPUT,
 				&bsi->bsi_base_id.eid_id );
 		if ( rc != SQL_SUCCESS ) {
@@ -2604,8 +2604,7 @@ backsql_entry_get(
 		/* find attribute values */
 		if ( is_entry_alias( bsi.bsi_e ) ) {
 			Debug( LDAP_DEBUG_ACL,
-				"<= backsql_entry_get: entry is an alias\n",
-				0, 0, 0 );
+				"<= backsql_entry_get: entry is an alias\n" );
 			rc = LDAP_ALIAS_PROBLEM;
 			goto return_results;
 		}
diff --git a/servers/slapd/back-wt/dn2id.c b/servers/slapd/back-wt/dn2id.c
index 5dec7b6e35..5e1b8d7776 100644
--- a/servers/slapd/back-wt/dn2id.c
+++ b/servers/slapd/back-wt/dn2id.c
@@ -363,7 +363,7 @@ wt_dn2id(
 	struct wt_info *wi = (struct wy_info *) op->o_bd->be_private;
 	WT_CURSOR *cursor = NULL;
 	int rc;
-	Debug( LDAP_DEBUG_TRACE, "=> wt_dn2id(\"%s\")\n", dn->bv_val, 0, 0 );
+	Debug( LDAP_DEBUG_TRACE, "=> wt_dn2id(\"%s\")\n", dn->bv_val );
 
 	rc = session->open_cursor(session, WT_INDEX_DN"(id)",
                               NULL, NULL, &cursor);
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 58e60869cc..dad24e1f3f 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -600,7 +600,7 @@ slap_global_control( Operation *op, const char *oid, int *cid )
 #if 0
 	Debug( LDAP_DEBUG_TRACE,
 		"slap_global_control: unavailable control: %s\n",      
-		oid, 0, 0 );
+		oid );
 #endif
 
 	return LDAP_COMPARE_FALSE;
diff --git a/servers/slapd/cr.c b/servers/slapd/cr.c
index c36852551c..487158fedd 100644
--- a/servers/slapd/cr.c
+++ b/servers/slapd/cr.c
@@ -485,7 +485,7 @@ cr_schema_info( Entry *e )
 #endif
 #if 0
 		Debug( LDAP_DEBUG_TRACE, "Merging cr [%ld] %s\n",
-	       (long) val.bv_len, val.bv_val, 0 );
+	       (long) val.bv_len, val.bv_val );
 #endif
 
 		nval.bv_val = cr->scr_oid;
diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index e1f2d96a1c..6d0f543efd 100644
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -505,7 +505,7 @@ int mr_schema_info( Entry *e )
 		}
 #if 0
 		Debug( LDAP_DEBUG_TRACE, "Merging mr [%lu] %s\n",
-			mr->smr_str.bv_len, mr->smr_str.bv_val, 0 );
+			mr->smr_str.bv_len, mr->smr_str.bv_val );
 #endif
 
 		nval.bv_val = mr->smr_oid;
@@ -536,7 +536,7 @@ int mru_schema_info( Entry *e )
 
 #if 0
 		Debug( LDAP_DEBUG_TRACE, "Merging mru [%lu] %s\n",
-			mru->smru_str.bv_len, mru->smru_str.bv_val, 0 );
+			mru->smru_str.bv_len, mru->smru_str.bv_val );
 #endif
 
 		nval.bv_val = mru->smru_oid;
diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c
index 348be5881a..2510cb1ca7 100644
--- a/servers/slapd/syntax.c
+++ b/servers/slapd/syntax.c
@@ -351,7 +351,7 @@ syn_schema_info( Entry *e )
 		}
 #if 0
 		Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n",
-	       (long) val.bv_len, val.bv_val, 0 );
+	       (long) val.bv_len, val.bv_val );
 #endif
 
 		nval.bv_val = syn->ssyn_oid;