Couldn't this be inside the `with-unique` above?