KRACOEUS-6955: code review comments, also fixing another maintenance situation.