Changes to combined-source program collector