(with-current-buffer): Minor cleanup. (with-temp-file): Support for arguments nil and t removed. (with-temp-buffer): Use this new macro instead. (with-output-to-string): Rewrite.