Update to work with changes to collect algorithm.