Replace several explicit Isos with calls to makeLenses