Fixed OpWithOriginal. test_call now compiles ...