Reverted style changes and ProgramCollector.Run behaviour change