Improve auto-resolution to prepare for rule removals