Remove the uses of #with without arguments