Make changes similar to those suggest by Keith Brown re #7484

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