Use lens>=4 type names, bump deps

This is the simplest change to work with lens 4 (I think); I'd push it directly but I'm not sure if you intend to maintain compatibility with lens 3?  Sorry for the spam on the earlier request; my fingers typed "newtype" out of habit. :)