Further changes to allow direct dispatch

Function calls are currently broken (OP_CALL).