Next lot of cleanup

`.map(_ => ())` can just be written as `.void` if that makes it easier.