Use “smart quotes”
[MAJOR] Partial rewrite of a couple of files.
Fix errors in rewrite