First swipe at generic diff for fixed-point values.
Second swipe.

This takes a different approach – defining a mergable functor, and a
“mergamorphism” in fixplate.
[minor] Rename a variable.
[minor] Refactoring.

* Move `Merge` to fp
* clean-up & reformat other functions
Fix up a couple small things.
Use the fixed-point Diff.