Adding auto-pairs for great good