Advanced Model Consistency Restoration with Higher-Order Short-Cut Rules (Logical Methods in Computer Science, 2024)