Fixed #323 partially completed merge.

The PR #323 was only partially merged.

This fixes the issue of having a compound `Lattice[A] with PartialOrder[A]`, splitting instead the implementations.