Fix expression-based unwind rules.