Clean up some uses of `Option::map` only for its side effects
auto merge of #672 : bkoropoff/cargo/option-map-cleanup, r=alexcrichton

This reduces syntactic noise and is a good use case for `if let`, which I turned on.