ISIS-509: tidy-up of Util classes.