Primo: make data extraction slightly more general

Probably the conversion at line 289 for contributors should be kept in sync?