Implement @agorrod's review comments, add a check that custom extractors don't repeat primary key columns.