HPCC-12010 Additional changes following review

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>