refactor: Avoid new/delete in a number of places.
#7041
| Job | Run time |
|---|---|
| 4s | |
| 4s |
new/delete in a number of places.
#7041
| Job | Run time |
|---|---|
| 4s | |
| 4s |