Tackled a cyclic dependency in Lens.

This probably breaks other places, though.