Coding improvements (3) re #9556

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>