These changes are all strictly "slap some double-quotes in there".
Anything more than that is not included in this commit.