More correctly, adapt to change in the input of Functors.
This goes together with: LHCb!3459 (merged) Rec!2512 (merged) Moore!1310 (merged)