[4.2] Removed Unneeded Calls To With

I've removed the rest of the calls to with. This was brought to my attention by #4930 which removed some, but not all of the no-longer needed function calls.