Remove unneeded calls to with
Fixed throws docs
Merge.