Fix '$' auto-pairing and Vintage (closes #308)