Add a diff canonifier to a test in need of it.
Fix a compiler warning regarding strncat misuse.