Functor units correctly adapted (in bytecode at least)
Next step -> see if there are any differences for native code, and
implement the application of functor units.