Shouldn't this be `FUNCTOR_2arg`?

I'm not sure, but are these the same as in the NEON branch? If so, make them common.