Handling some issues in enrichment data generation (closes #76)

So you want each element in `enriched` to consist of a pair of tuples? (I may well be misunderstanding this bit.)