Improved partial order guarding.