Fix up quoting, and remove contractions