Changed `df` and `dc` to use non-word-diff. Added `dfw` and `dcw`.