Rewrite with named lenses and delete shapeless.