Index: uspace/drv/uhci_hcd/batch.c
===================================================================
--- uspace/drv/uhci_hcd/batch.c	(revision 98caf4982b79d4e33b68e85bd8d2cc56a445ada1)
+++ uspace/drv/uhci_hcd/batch.c	(revision c4fb5ecd0a4e0a7c884639ad36c66c4344f7b200)
@@ -147,6 +147,4 @@
 	    + sizeof(qh_t);
 	void *data_buffer = setup + setup_size;
-	usb_target_t target =
-	    { .address = ep->address, .endpoint = ep->endpoint };
 	usb_transfer_batch_init(instance, ep, buffer, data_buffer, buffer_size,
 	    setup, setup_size, func_in, func_out, arg, fun,
@@ -154,6 +152,7 @@
 
 	memcpy(instance->setup_buffer, setup_buffer, setup_size);
-	usb_log_debug("Batch(%p) %d:%d memory structures ready.\n",
-	    instance, target.address, target.endpoint);
+	usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT
+	    " memory structures ready.\n", instance,
+	    USB_TRANSFER_BATCH_ARGS(*instance));
 	return instance;
 }
@@ -205,4 +204,9 @@
 	return true;
 }
+
+#define LOG_BATCH_INITIALIZED(batch, name) \
+	usb_log_debug2("Batch %p %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
+	    (batch), (name), USB_TRANSFER_BATCH_ARGS(*(batch)))
+
 /*----------------------------------------------------------------------------*/
 /** Prepares control write transfer.
@@ -219,5 +223,5 @@
 	batch_control(instance, USB_PID_OUT, USB_PID_IN);
 	instance->next_step = usb_transfer_batch_call_out_and_dispose;
-	usb_log_debug("Batch(%p) CONTROL WRITE initialized.\n", instance);
+	LOG_BATCH_INITIALIZED(instance, "control write");
 }
 /*----------------------------------------------------------------------------*/
@@ -233,5 +237,5 @@
 	batch_control(instance, USB_PID_IN, USB_PID_OUT);
 	instance->next_step = usb_transfer_batch_call_in_and_dispose;
-	usb_log_debug("Batch(%p) CONTROL READ initialized.\n", instance);
+	LOG_BATCH_INITIALIZED(instance, "control read");
 }
 /*----------------------------------------------------------------------------*/
@@ -247,5 +251,5 @@
 	batch_data(instance, USB_PID_IN);
 	instance->next_step = usb_transfer_batch_call_in_and_dispose;
-	usb_log_debug("Batch(%p) INTERRUPT IN initialized.\n", instance);
+	LOG_BATCH_INITIALIZED(instance, "interrupt in");
 }
 /*----------------------------------------------------------------------------*/
@@ -263,5 +267,5 @@
 	batch_data(instance, USB_PID_OUT);
 	instance->next_step = usb_transfer_batch_call_out_and_dispose;
-	usb_log_debug("Batch(%p) INTERRUPT OUT initialized.\n", instance);
+	LOG_BATCH_INITIALIZED(instance, "interrupt out");
 }
 /*----------------------------------------------------------------------------*/
@@ -277,5 +281,5 @@
 	batch_data(instance, USB_PID_IN);
 	instance->next_step = usb_transfer_batch_call_in_and_dispose;
-	usb_log_debug("Batch(%p) BULK IN initialized.\n", instance);
+	LOG_BATCH_INITIALIZED(instance, "bulk in");
 }
 /*----------------------------------------------------------------------------*/
@@ -293,5 +297,5 @@
 	batch_data(instance, USB_PID_OUT);
 	instance->next_step = usb_transfer_batch_call_out_and_dispose;
-	usb_log_debug("Batch(%p) BULK OUT initialized.\n", instance);
+	LOG_BATCH_INITIALIZED(instance, "bulk out");
 }
 /*----------------------------------------------------------------------------*/
Index: uspace/drv/uhci_hcd/hw_struct/transfer_descriptor.c
===================================================================
--- uspace/drv/uhci_hcd/hw_struct/transfer_descriptor.c	(revision 98caf4982b79d4e33b68e85bd8d2cc56a445ada1)
+++ uspace/drv/uhci_hcd/hw_struct/transfer_descriptor.c	(revision c4fb5ecd0a4e0a7c884639ad36c66c4344f7b200)
@@ -103,5 +103,5 @@
 	td_print_status(instance);
 	if (pid == USB_PID_SETUP) {
-		usb_log_debug("SETUP BUFFER: %s\n",
+		usb_log_debug2("SETUP BUFFER: %s\n",
 		    usb_debug_str_buffer(buffer, 8, 8));
 	}
Index: uspace/drv/uhci_hcd/iface.c
===================================================================
--- uspace/drv/uhci_hcd/iface.c	(revision 98caf4982b79d4e33b68e85bd8d2cc56a445ada1)
+++ uspace/drv/uhci_hcd/iface.c	(revision c4fb5ecd0a4e0a7c884639ad36c66c4344f7b200)
@@ -64,5 +64,5 @@
 	}
 
-	usb_log_debug("%s %d:%d %zu(%zu).\n",
+	usb_log_debug2("%s %d:%d %zu(%zu).\n",
 	    name, target.address, target.endpoint, size, ep->max_packet_size);
 
@@ -172,7 +172,8 @@
 		speed = ep_speed;
 	}
-	usb_log_debug("Register endpoint %d:%d %s %s(%d) %zu(%zu) %u.\n",
+	usb_log_debug("Register endpoint %d:%d %s-%s %s %zuB %ums.\n",
 	    address, endpoint, usb_str_transfer_type(transfer_type),
-	    usb_str_speed(speed), direction, size, max_packet_size, interval);
+	    usb_str_direction(direction), usb_str_speed(speed),
+	    max_packet_size, interval);
 
 	return usb_endpoint_manager_add_ep(&hc->ep_manager, address, endpoint,
@@ -187,6 +188,6 @@
 	hc_t *hc = fun_to_hc(fun);
 	assert(hc);
-	usb_log_debug("Unregister endpoint %d:%d %d.\n",
-	    address, endpoint, direction);
+	usb_log_debug("Unregister endpoint %d:%d %s.\n",
+	    address, endpoint, usb_str_direction(direction));
 	return usb_endpoint_manager_unregister_ep(&hc->ep_manager, address,
 	    endpoint, direction);
Index: uspace/drv/uhci_hcd/transfer_list.c
===================================================================
--- uspace/drv/uhci_hcd/transfer_list.c	(revision 98caf4982b79d4e33b68e85bd8d2cc56a445ada1)
+++ uspace/drv/uhci_hcd/transfer_list.c	(revision c4fb5ecd0a4e0a7c884639ad36c66c4344f7b200)
@@ -141,8 +141,6 @@
 	list_append(&batch->link, &instance->batch_list);
 
-	usb_transfer_batch_t *first = list_get_instance(
-	    instance->batch_list.next, usb_transfer_batch_t, link);
-	usb_log_debug("Batch(%p) added to queue %s, first is %p.\n",
-		batch, instance->name, first);
+	usb_log_debug("Batch %p " USB_TRANSFER_BATCH_FMT " scheduled in queue %s.\n",
+	    batch, USB_TRANSFER_BATCH_ARGS(*batch), instance->name);
 	fibril_mutex_unlock(&instance->guard);
 }
@@ -234,6 +232,8 @@
 	/* Remove from the batch list */
 	list_remove(&batch->link);
-	usb_log_debug("Batch(%p) removed (%s) from %s, next: %x.\n",
-	    batch, qpos, instance->name, batch_qh(batch)->next);
+	usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " removed (%s) "
+	    "from %s, next: %x.\n",
+	    batch, USB_TRANSFER_BATCH_ARGS(*batch),
+	    qpos, instance->name, batch_qh(batch)->next);
 }
 /**