Builds without vector-space.
Update for new lenses.