Added a few missing Eq/Ord/Show instances. Tiny cleanups on the way.