Upgrade to latest lens

This upgrade started asking for UndecidableInstances.  I added it for now, but
eventually we might want to see if there's a workaround.