contrib: squash two more recursive dependencies