Fix some more clippy complaints currently ignored
Among those that could probably easily be removed are:
clippy::let_and_return
clippy::type_complexity
clippy::option_map_unit_fn
Among those that could probably easily be removed are:
clippy::let_and_return
clippy::type_complexity
clippy::option_map_unit_fn