Also fix several recently introduced new/delete vs. malloc/free mismatches. svn-id: r47369
svn-id: r47368