Merge "optimize delete/delete[] operators by removing unneeded branch"