removed more duplication in forall-next