Reduce use of `with-current-buffer'.

No `let' is required now.