Simplify collection spaghetti.

There was not really a need for the lattice type classes, so I removed
these.
1 job for master