I also considered doing likewise in CSGObject,
but found this would be complicated by the use of
shapes returned by ComponentCtreationHeliper.
I did make use of auto to make such a change easier.

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