Improved diff canonifiers

Improved a couple diff canonifiers and added a few new ones in order
to do more thorough checking of test output.