diff --git a/src/xrt/drivers/ht/ht_driver.c b/src/xrt/drivers/ht/ht_driver.c
index 5f7deceb1..7a2ea8f68 100644
--- a/src/xrt/drivers/ht/ht_driver.c
+++ b/src/xrt/drivers/ht/ht_driver.c
@@ -287,7 +287,7 @@ ht_device_create(struct xrt_prober *xp, struct t_stereo_camera_calibration *cali
 
 	// This puts u_sink_create_to_r8g8b8_or_l8 on its own thread, so that nothing gets backed up if it runs slower
 	// than the native camera framerate.
-	u_sink_queue_create(&htd->xfctx, 1, tmp, &tmp);
+	u_sink_simple_queue_create(&htd->xfctx, tmp, &tmp);
 
 	struct xrt_fs_mode *modes;
 	uint32_t count;
diff --git a/src/xrt/state_trackers/gui/gui_scene_calibrate.c b/src/xrt/state_trackers/gui/gui_scene_calibrate.c
index efd2c65a5..026d11281 100644
--- a/src/xrt/state_trackers/gui/gui_scene_calibrate.c
+++ b/src/xrt/state_trackers/gui/gui_scene_calibrate.c
@@ -330,16 +330,16 @@ scene_render_select(struct gui_scene *scene, struct gui_program *p)
 
 	p->texs[p->num_texs++] = gui_ogl_sink_create("Calibration", cs->xfctx, &rgb);
 	u_sink_create_to_r8g8b8_or_l8(cs->xfctx, rgb, &rgb);
-	u_sink_queue_create(cs->xfctx, 1, rgb, &rgb);
+	u_sink_simple_queue_create(cs->xfctx, rgb, &rgb);
 
 	p->texs[p->num_texs++] = gui_ogl_sink_create("Raw", cs->xfctx, &raw);
 	u_sink_create_to_r8g8b8_or_l8(cs->xfctx, raw, &raw);
-	u_sink_queue_create(cs->xfctx, 1, raw, &raw);
+	u_sink_simple_queue_create(cs->xfctx, raw, &raw);
 
 	t_calibration_stereo_create(cs->xfctx, &cs->params, &cs->status, rgb, &cali);
 	u_sink_split_create(cs->xfctx, raw, cali, &cali);
 	u_sink_deinterleaver_create(cs->xfctx, cali, &cali);
-	u_sink_queue_create(cs->xfctx, 1, cali, &cali);
+	u_sink_simple_queue_create(cs->xfctx, cali, &cali);
 
 	// Just after the camera create a quirk stream.
 	struct u_sink_quirk_params qp;
diff --git a/src/xrt/state_trackers/gui/gui_window_record.c b/src/xrt/state_trackers/gui/gui_window_record.c
index 51a0d95d4..930d68223 100644
--- a/src/xrt/state_trackers/gui/gui_window_record.c
+++ b/src/xrt/state_trackers/gui/gui_window_record.c
@@ -126,7 +126,7 @@ create_pipeline(struct gui_record_window *rw)
 	if (do_convert) {
 		u_sink_create_to_r8g8b8_or_l8(&rw->gst.xfctx, tmp, &tmp);
 	}
-	u_sink_queue_create(&rw->gst.xfctx, 1, tmp, &tmp);
+	u_sink_simple_queue_create(&rw->gst.xfctx, tmp, &tmp);
 
 	os_mutex_lock(&rw->gst.mutex);
 	rw->gst.gs = gs;
@@ -281,7 +281,7 @@ gui_window_record_init(struct gui_record_window *rw)
 	struct xrt_frame_sink *tmp = NULL;
 	rw->texture.ogl = gui_ogl_sink_create("View", &rw->texture.xfctx, &tmp);
 	u_sink_create_to_r8g8b8_r8g8b8a8_r8g8b8x8_or_l8(&rw->texture.xfctx, tmp, &tmp);
-	u_sink_queue_create(&rw->texture.xfctx, 1, tmp, &rw->texture.sink);
+	u_sink_simple_queue_create(&rw->texture.xfctx, tmp, &rw->texture.sink);
 
 	return true;
 }
diff --git a/src/xrt/state_trackers/prober/p_tracking.c b/src/xrt/state_trackers/prober/p_tracking.c
index 2bc1fba55..f4c35d1a4 100644
--- a/src/xrt/state_trackers/prober/p_tracking.c
+++ b/src/xrt/state_trackers/prober/p_tracking.c
@@ -192,7 +192,7 @@ p_factory_ensure_frameserver(struct p_factory *fact)
 	u_sink_create_to_yuv_or_yuyv(&fact->xfctx, xsink, &xsink);
 
 	// Put a queue before it to multi-thread the filter.
-	u_sink_queue_create(&fact->xfctx, 1, xsink, &xsink);
+	u_sink_simple_queue_create(&fact->xfctx, xsink, &xsink);
 
 	struct xrt_frame_sink *ht_sink = NULL;
 	t_hand_create(&fact->xfctx, fact->data, &fact->xth, &ht_sink);