Get rid of `tap` (/cc @alloy)