[perl-DBIx-DBSchema/f15: 3/3] Merge cleanup.