New lens versions. Using let..in for consistency with rest of module.