Remove unneeded calls to with
Fixed various docblocks
Merge.