Rework after review. Full TreeIngesterTest still outstanding.