Updated the patch again to apply cleanly, as there were some more changes to c-ts-mode.el.