Disregard previuos patch. This one includes one more case of string-fontification which I uncovered when testing with more files I had lying around.