[dev] Converting more functors to new format.