Improve on previous quote autopairing change