HPCC-10983 Use a simpler method of preventing recursive hoisting

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>