HPCC-9602 Avoid temporary variables when returing simple expressions

The "very temporary" fix has been in there for many many years, and has
been redundant for most of them.

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>