Revert renamings, and other cleanup, in 'Data.Vinyl.Lens'