adjusting with/use clauses with reformatting witness sets