Update Wrapped instances for lens-4.0

Do not merge until the rest of diagrams is similarly updated.  Opening the PR to make sure anyone else inclined to build against lens-4.0 finds it.

[lens-4.0](http://hackage.haskell.org/package/lens) changes the interface for `Wrapped`, including reversing the order of type parameters.  All instances and uses need to be changed.

The commit below is sufficient to build -core.