Re #6709 several algorithms changed to new format