Decouple field definitions and result building

Fixes broken spec for deductions