HPCC-12285 Change after Gavin's review

Signed-off-by: jamienoss <james.noss@lexisnexis.com>
Leak hunting

Signed-off-by: jamienoss <james.noss@lexisnexis.com>