EAV extract format

Why the def? Not necessarily wrong, just the call sites of some of these were quite sensitive.