Replace some occurences of and_then() by map() as suggest by clippy lint...

Replace some occurences of and_then() by map() as suggest by clippy lint clippy::bind-instead-of-map
2 jobs for master in 20 minutes and 39 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #2091
test

00:08:08

 
  Build
passed #2092
build

00:12:31