Update path solver.
Update path solver.
Simplify suppression rules.