Fixing a few problems with the model-lineage builder, where it was stubbing models inappropriately and other minor logical problems.