Cleanup
Fix bug in rule merging causing duplicate rules for overloaded arrows.