Merge pull request #2714 from TheBlueMatt/2023-11-one-less-alloc