Simplify & speed up function calling

Get rid of the SimpleCallContext, instead simply
use the CallContext data structure, but don't
initialize the unused variables.

Change-Id: I11b311986da180c62c815b516a2c55844156d0ab
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

61 files changed, 924 insertions, 926 deletions

diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index 3202acc82b..145487cf3e 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -133,7 +133,7 @@ public:
 
 DEFINE_MANAGED_VTABLE(QQmlSqlDatabaseWrapper);
 
-static ReturnedValue qmlsqldatabase_version(SimpleCallContext *ctx)
+static ReturnedValue qmlsqldatabase_version(CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlSqlDatabaseWrapper> r(scope, ctx->callData->thisObject.as<QQmlSqlDatabaseWrapper>());
@@ -143,7 +143,7 @@ static ReturnedValue qmlsqldatabase_version(SimpleCallContext *ctx)
     return Encode(ctx->engine->newString(r->version));
 }
 
-static ReturnedValue qmlsqldatabase_rows_length(SimpleCallContext *ctx)
+static ReturnedValue qmlsqldatabase_rows_length(CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlSqlDatabaseWrapper> r(scope, ctx->callData->thisObject.as<QQmlSqlDatabaseWrapper>());
@@ -162,7 +162,7 @@ static ReturnedValue qmlsqldatabase_rows_length(SimpleCallContext *ctx)
     return Encode(s);
 }
 
-static ReturnedValue qmlsqldatabase_rows_forwardOnly(SimpleCallContext *ctx)
+static ReturnedValue qmlsqldatabase_rows_forwardOnly(CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlSqlDatabaseWrapper> r(scope, ctx->callData->thisObject.as<QQmlSqlDatabaseWrapper>());
@@ -171,7 +171,7 @@ static ReturnedValue qmlsqldatabase_rows_forwardOnly(SimpleCallContext *ctx)
     return Encode(r->sqlQuery.isForwardOnly());
 }
 
-static ReturnedValue qmlsqldatabase_rows_setForwardOnly(SimpleCallContext *ctx)
+static ReturnedValue qmlsqldatabase_rows_setForwardOnly(CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlSqlDatabaseWrapper> r(scope, ctx->callData->thisObject.as<QQmlSqlDatabaseWrapper>());
@@ -241,7 +241,7 @@ ReturnedValue QQmlSqlDatabaseWrapper::getIndexed(Managed *m, uint index, bool *h
     return qmlsqldatabase_rows_index(r, m->engine(), index, hasProperty);
 }
 
-static ReturnedValue qmlsqldatabase_rows_item(SimpleCallContext *ctx)
+static ReturnedValue qmlsqldatabase_rows_item(CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlSqlDatabaseWrapper> r(scope, ctx->callData->thisObject.as<QQmlSqlDatabaseWrapper>());
@@ -251,7 +251,7 @@ static ReturnedValue qmlsqldatabase_rows_item(SimpleCallContext *ctx)
     return qmlsqldatabase_rows_index(r, ctx->engine, ctx->callData->argc ? ctx->callData->args[0].toUInt32() : 0);
 }
 
-static ReturnedValue qmlsqldatabase_executeSql(SimpleCallContext *ctx)
+static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlSqlDatabaseWrapper> r(scope, ctx->callData->thisObject.as<QQmlSqlDatabaseWrapper>());
@@ -363,7 +363,7 @@ struct TransactionRollback {
 };
 
 
-static ReturnedValue qmlsqldatabase_changeVersion(SimpleCallContext *ctx)
+static ReturnedValue qmlsqldatabase_changeVersion(CallContext *ctx)
 {
     if (ctx->callData->argc < 2)
         return Encode::undefined();
@@ -422,7 +422,7 @@ static ReturnedValue qmlsqldatabase_changeVersion(SimpleCallContext *ctx)
     return Encode::undefined();
 }
 
-static ReturnedValue qmlsqldatabase_transaction_shared(SimpleCallContext *ctx, bool readOnly)
+static ReturnedValue qmlsqldatabase_transaction_shared(CallContext *ctx, bool readOnly)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlSqlDatabaseWrapper> r(scope, ctx->callData->thisObject.as<QQmlSqlDatabaseWrapper>());
@@ -461,12 +461,12 @@ static ReturnedValue qmlsqldatabase_transaction_shared(SimpleCallContext *ctx, b
     return Encode::undefined();
 }
 
-static ReturnedValue qmlsqldatabase_transaction(SimpleCallContext *ctx)
+static ReturnedValue qmlsqldatabase_transaction(CallContext *ctx)
 {
     return qmlsqldatabase_transaction_shared(ctx, false);
 }
 
-static ReturnedValue qmlsqldatabase_read_transaction(SimpleCallContext *ctx)
+static ReturnedValue qmlsqldatabase_read_transaction(CallContext *ctx)
 {
     return qmlsqldatabase_transaction_shared(ctx, true);
 }
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp
index 0524a5a871..6f9cd829bb 100644
--- a/src/particles/qquickv4particledata.cpp
+++ b/src/particles/qquickv4particledata.cpp
@@ -298,7 +298,7 @@ public:
     QV4::PersistentValue proto;
 };
 
-static QV4::ReturnedValue particleData_discard(QV4::SimpleCallContext *ctx)
+static QV4::ReturnedValue particleData_discard(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject);
@@ -310,7 +310,7 @@ static QV4::ReturnedValue particleData_discard(QV4::SimpleCallContext *ctx)
     return QV4::Encode::undefined();
 }
 
-static QV4::ReturnedValue particleData_lifeLeft(QV4::SimpleCallContext *ctx)
+static QV4::ReturnedValue particleData_lifeLeft(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject);
@@ -321,7 +321,7 @@ static QV4::ReturnedValue particleData_lifeLeft(QV4::SimpleCallContext *ctx)
     return QV4::Encode(r->datum->lifeLeft());
 }
 
-static QV4::ReturnedValue particleData_curSize(QV4::SimpleCallContext *ctx)
+static QV4::ReturnedValue particleData_curSize(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject);
@@ -331,7 +331,7 @@ static QV4::ReturnedValue particleData_curSize(QV4::SimpleCallContext *ctx)
 
     return QV4::Encode(r->datum->curSize());
 }
-#define COLOR_GETTER_AND_SETTER(VAR, NAME) static QV4::ReturnedValue particleData_get_ ## NAME (QV4::SimpleCallContext *ctx) \
+#define COLOR_GETTER_AND_SETTER(VAR, NAME) static QV4::ReturnedValue particleData_get_ ## NAME (QV4::CallContext *ctx) \
 { \
     QV4::Scope scope(ctx); \
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject); \
@@ -341,7 +341,7 @@ static QV4::ReturnedValue particleData_curSize(QV4::SimpleCallContext *ctx)
     return QV4::Encode((r->datum->color. VAR )/255.0);\
 }\
 \
-static QV4::ReturnedValue particleData_set_ ## NAME (QV4::SimpleCallContext *ctx)\
+static QV4::ReturnedValue particleData_set_ ## NAME (QV4::CallContext *ctx)\
 {\
     QV4::Scope scope(ctx); \
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject); \
@@ -354,7 +354,7 @@ static QV4::ReturnedValue particleData_set_ ## NAME (QV4::SimpleCallContext *ctx
 }
 
 
-#define SEMIBOOL_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::SimpleCallContext *ctx) \
+#define SEMIBOOL_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::CallContext *ctx) \
 { \
     QV4::Scope scope(ctx); \
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject); \
@@ -364,7 +364,7 @@ static QV4::ReturnedValue particleData_set_ ## NAME (QV4::SimpleCallContext *ctx
     return QV4::Encode(r->datum-> VARIABLE);\
 }\
 \
-static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::SimpleCallContext *ctx)\
+static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\
 {\
     QV4::Scope scope(ctx); \
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject); \
@@ -375,7 +375,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::SimpleCallContext
     return QV4::Encode::undefined(); \
 }
 
-#define FLOAT_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::SimpleCallContext *ctx) \
+#define FLOAT_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::CallContext *ctx) \
 { \
     QV4::Scope scope(ctx); \
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject); \
@@ -385,7 +385,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::SimpleCallContext
     return QV4::Encode(r->datum-> VARIABLE);\
 }\
 \
-static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::SimpleCallContext *ctx)\
+static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\
 {\
     QV4::Scope scope(ctx); \
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject); \
@@ -396,7 +396,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::SimpleCallContext
     return QV4::Encode::undefined(); \
 }
 
-#define FAKE_FLOAT_GETTER_AND_SETTER(VARIABLE, GETTER, SETTER) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::SimpleCallContext *ctx) \
+#define FAKE_FLOAT_GETTER_AND_SETTER(VARIABLE, GETTER, SETTER) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::CallContext *ctx) \
 { \
     QV4::Scope scope(ctx); \
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject); \
@@ -406,7 +406,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::SimpleCallContext
     return QV4::Encode(r->datum-> GETTER ());\
 }\
 \
-static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::SimpleCallContext *ctx)\
+static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\
 {\
     QV4::Scope scope(ctx); \
     QV4::Scoped<QV4ParticleData> r(scope, ctx->callData->thisObject); \
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index 4810e4dace..640dad9c99 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -1957,7 +1957,7 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast,
 
     V4IR::BasicBlock *entryBlock = function->newBasicBlock(groupStartBlock(), 0);
     V4IR::BasicBlock *exitBlock = function->newBasicBlock(groupStartBlock(), 0, V4IR::Function::DontInsertBlock);
-    function->hasDirectEval = _env->hasDirectEval;
+    function->hasDirectEval = _env->hasDirectEval || _env->compilationMode == EvalCode;
     function->usesArgumentsObject = _env->parent && (_env->usesArgumentsObject == Environment::ArgumentsObjectUsed);
     function->usesThis = _env->usesThis;
     function->maxNumberOfArguments = qMax(_env->maxNumberOfArguments, (int)QV4::Global::ReservedArgumentCount);
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index bfbb40445a..90f27d5f57 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -217,7 +217,8 @@ struct Function
         HasDirectEval       = 0x1,
         UsesArgumentsObject = 0x2,
         IsStrict            = 0x4,
-        IsNamedExpression   = 0x8
+        IsNamedExpression   = 0x8,
+        HasCatchOrWith      = 0x10
     };
 
     quint32 index; // in CompilationUnit's function table
diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp
index a808e88afa..b38c394bdc 100644
--- a/src/qml/compiler/qv4compiler.cpp
+++ b/src/qml/compiler/qv4compiler.cpp
@@ -331,6 +331,8 @@ int QV4::Compiler::JSUnitGenerator::writeFunction(char *f, int index, QQmlJS::V4
         function->flags |= CompiledData::Function::IsStrict;
     if (irFunction->isNamedExpression)
         function->flags |= CompiledData::Function::IsNamedExpression;
+    if (irFunction->hasTry || irFunction->hasWith)
+        function->flags |= CompiledData::Function::HasCatchOrWith;
     function->nFormals = irFunction->formals.size();
     function->formalsOffset = currentOffset;
     currentOffset += function->nFormals * sizeof(quint32);
diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp
index 58bf102c9d..e49216b103 100644
--- a/src/qml/compiler/qv4isel_masm.cpp
+++ b/src/qml/compiler/qv4isel_masm.cpp
@@ -310,7 +310,7 @@ Assembler::Pointer Assembler::loadTempAddress(RegisterID baseReg, V4IR::Temp *t)
     switch (t->kind) {
     case V4IR::Temp::Formal:
     case V4IR::Temp::ScopedFormal: {
-        loadPtr(Address(context, qOffsetOf(CallContext, callData)), baseReg);
+        loadPtr(Address(context, qOffsetOf(ExecutionContext, callData)), baseReg);
         offset = sizeof(CallData) + (t->index - 1) * sizeof(SafeValue);
     } break;
     case V4IR::Temp::Local:
@@ -953,7 +953,7 @@ void InstructionSelection::callValue(V4IR::Temp *value, V4IR::ExprList *args, V4
 
 void InstructionSelection::loadThisObject(V4IR::Temp *temp)
 {
-    _as->loadPtr(Address(Assembler::ContextRegister, qOffsetOf(CallContext, callData)), Assembler::ScratchRegister);
+    _as->loadPtr(Address(Assembler::ContextRegister, qOffsetOf(ExecutionContext, callData)), Assembler::ScratchRegister);
 #if defined(VALUE_FITS_IN_REGISTER)
     _as->load64(Pointer(Assembler::ScratchRegister, qOffsetOf(CallData, thisObject)),
                 Assembler::ReturnValueRegister);
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp
index 85423a4118..5422bff800 100644
--- a/src/qml/jsruntime/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
@@ -131,13 +131,13 @@ uint ArrayPrototype::getLength(ExecutionContext *ctx, ObjectRef o)
     return v->toUInt32();
 }
 
-ReturnedValue ArrayPrototype::method_isArray(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_isArray(CallContext *ctx)
 {
     bool isArray = ctx->callData->argc && ctx->callData->args[0].asArrayObject();
     return Encode(isArray);
 }
 
-ReturnedValue ArrayPrototype::method_toString(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_toString(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject o(scope, ctx->callData->thisObject, ScopedObject::Convert);
@@ -153,12 +153,12 @@ ReturnedValue ArrayPrototype::method_toString(SimpleCallContext *ctx)
     return ObjectPrototype::method_toString(ctx);
 }
 
-ReturnedValue ArrayPrototype::method_toLocaleString(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_toLocaleString(CallContext *ctx)
 {
     return method_toString(ctx);
 }
 
-ReturnedValue ArrayPrototype::method_concat(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_concat(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject result(scope, ctx->engine->newArrayObject());
@@ -185,7 +185,7 @@ ReturnedValue ArrayPrototype::method_concat(SimpleCallContext *ctx)
     return result.asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_join(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_join(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedValue arg(scope, ctx->argument(0));
@@ -244,7 +244,7 @@ ReturnedValue ArrayPrototype::method_join(SimpleCallContext *ctx)
     return ctx->engine->newString(R)->asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_pop(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_pop(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -272,7 +272,7 @@ ReturnedValue ArrayPrototype::method_pop(SimpleCallContext *ctx)
     return result.asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_push(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_push(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -326,7 +326,7 @@ ReturnedValue ArrayPrototype::method_push(SimpleCallContext *ctx)
     return Encode(len);
 }
 
-ReturnedValue ArrayPrototype::method_reverse(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_reverse(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -358,7 +358,7 @@ ReturnedValue ArrayPrototype::method_reverse(SimpleCallContext *ctx)
     return instance.asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_shift(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_shift(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -418,7 +418,7 @@ ReturnedValue ArrayPrototype::method_shift(SimpleCallContext *ctx)
     return result.asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_slice(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_slice(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject o(scope, ctx->callData->thisObject.toObject(ctx));
@@ -460,7 +460,7 @@ ReturnedValue ArrayPrototype::method_slice(SimpleCallContext *ctx)
     return result.asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_sort(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_sort(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -474,7 +474,7 @@ ReturnedValue ArrayPrototype::method_sort(SimpleCallContext *ctx)
     return ctx->callData->thisObject.asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_splice(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_splice(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -552,7 +552,7 @@ ReturnedValue ArrayPrototype::method_splice(SimpleCallContext *ctx)
     return newArray.asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_unshift(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_unshift(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -604,7 +604,7 @@ ReturnedValue ArrayPrototype::method_unshift(SimpleCallContext *ctx)
     return Encode(newLen);
 }
 
-ReturnedValue ArrayPrototype::method_indexOf(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_indexOf(CallContext *ctx)
 {
     Scope scope(ctx);
 
@@ -643,7 +643,7 @@ ReturnedValue ArrayPrototype::method_indexOf(SimpleCallContext *ctx)
     return instance->arrayIndexOf(searchValue, fromIndex, len, ctx, instance.getPointer());
 }
 
-ReturnedValue ArrayPrototype::method_lastIndexOf(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_lastIndexOf(CallContext *ctx)
 {
     Scope scope(ctx);
 
@@ -689,7 +689,7 @@ ReturnedValue ArrayPrototype::method_lastIndexOf(SimpleCallContext *ctx)
     return Encode(-1);
 }
 
-ReturnedValue ArrayPrototype::method_every(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_every(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -723,7 +723,7 @@ ReturnedValue ArrayPrototype::method_every(SimpleCallContext *ctx)
     return Encode(ok);
 }
 
-ReturnedValue ArrayPrototype::method_some(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_some(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -757,7 +757,7 @@ ReturnedValue ArrayPrototype::method_some(SimpleCallContext *ctx)
     return Encode(false);
 }
 
-ReturnedValue ArrayPrototype::method_forEach(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_forEach(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -788,7 +788,7 @@ ReturnedValue ArrayPrototype::method_forEach(SimpleCallContext *ctx)
     return Encode::undefined();
 }
 
-ReturnedValue ArrayPrototype::method_map(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_map(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -825,7 +825,7 @@ ReturnedValue ArrayPrototype::method_map(SimpleCallContext *ctx)
     return a.asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_filter(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_filter(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -866,7 +866,7 @@ ReturnedValue ArrayPrototype::method_filter(SimpleCallContext *ctx)
     return a.asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_reduce(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_reduce(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> instance(scope, ctx->callData->thisObject.toObject(ctx));
@@ -916,7 +916,7 @@ ReturnedValue ArrayPrototype::method_reduce(SimpleCallContext *ctx)
     return acc.asReturnedValue();
 }
 
-ReturnedValue ArrayPrototype::method_reduceRight(SimpleCallContext *ctx)
+ReturnedValue ArrayPrototype::method_reduceRight(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> instance(scope, ctx->callData->thisObject.toObject(ctx));
diff --git a/src/qml/jsruntime/qv4arrayobject_p.h b/src/qml/jsruntime/qv4arrayobject_p.h
index 933939e279..7e809f9064 100644
--- a/src/qml/jsruntime/qv4arrayobject_p.h
+++ b/src/qml/jsruntime/qv4arrayobject_p.h
@@ -66,28 +66,28 @@ struct ArrayPrototype: ArrayObject
 
     static uint getLength(ExecutionContext *ctx, ObjectRef o);
 
-    static ReturnedValue method_isArray(SimpleCallContext *ctx);
-    static ReturnedValue method_toString(SimpleCallContext *ctx);
-    static ReturnedValue method_toLocaleString(SimpleCallContext *ctx);
-    static ReturnedValue method_concat(SimpleCallContext *ctx);
-    static ReturnedValue method_join(SimpleCallContext *ctx);
-    static ReturnedValue method_pop(SimpleCallContext *ctx);
-    static ReturnedValue method_push(SimpleCallContext *ctx);
-    static ReturnedValue method_reverse(SimpleCallContext *ctx);
-    static ReturnedValue method_shift(SimpleCallContext *ctx);
-    static ReturnedValue method_slice(SimpleCallContext *ctx);
-    static ReturnedValue method_sort(SimpleCallContext *ctx);
-    static ReturnedValue method_splice(SimpleCallContext *ctx);
-    static ReturnedValue method_unshift(SimpleCallContext *ctx);
-    static ReturnedValue method_indexOf(SimpleCallContext *ctx);
-    static ReturnedValue method_lastIndexOf(SimpleCallContext *ctx);
-    static ReturnedValue method_every(SimpleCallContext *ctx);
-    static ReturnedValue method_some(SimpleCallContext *ctx);
-    static ReturnedValue method_forEach(SimpleCallContext *ctx);
-    static ReturnedValue method_map(SimpleCallContext *ctx);
-    static ReturnedValue method_filter(SimpleCallContext *ctx);
-    static ReturnedValue method_reduce(SimpleCallContext *ctx);
-    static ReturnedValue method_reduceRight(SimpleCallContext *ctx);
+    static ReturnedValue method_isArray(CallContext *ctx);
+    static ReturnedValue method_toString(CallContext *ctx);
+    static ReturnedValue method_toLocaleString(CallContext *ctx);
+    static ReturnedValue method_concat(CallContext *ctx);
+    static ReturnedValue method_join(CallContext *ctx);
+    static ReturnedValue method_pop(CallContext *ctx);
+    static ReturnedValue method_push(CallContext *ctx);
+    static ReturnedValue method_reverse(CallContext *ctx);
+    static ReturnedValue method_shift(CallContext *ctx);
+    static ReturnedValue method_slice(CallContext *ctx);
+    static ReturnedValue method_sort(CallContext *ctx);
+    static ReturnedValue method_splice(CallContext *ctx);
+    static ReturnedValue method_unshift(CallContext *ctx);
+    static ReturnedValue method_indexOf(CallContext *ctx);
+    static ReturnedValue method_lastIndexOf(CallContext *ctx);
+    static ReturnedValue method_every(CallContext *ctx);
+    static ReturnedValue method_some(CallContext *ctx);
+    static ReturnedValue method_forEach(CallContext *ctx);
+    static ReturnedValue method_map(CallContext *ctx);
+    static ReturnedValue method_filter(CallContext *ctx);
+    static ReturnedValue method_reduce(CallContext *ctx);
+    static ReturnedValue method_reduceRight(CallContext *ctx);
 };
 
 
diff --git a/src/qml/jsruntime/qv4booleanobject.cpp b/src/qml/jsruntime/qv4booleanobject.cpp
index d9de6d9fba..a0d0027e5f 100644
--- a/src/qml/jsruntime/qv4booleanobject.cpp
+++ b/src/qml/jsruntime/qv4booleanobject.cpp
@@ -77,7 +77,7 @@ void BooleanPrototype::init(ExecutionEngine *engine, ObjectRef ctor)
     defineDefaultProperty(engine->id_valueOf, method_valueOf);
 }
 
-ReturnedValue BooleanPrototype::method_toString(SimpleCallContext *ctx)
+ReturnedValue BooleanPrototype::method_toString(CallContext *ctx)
 {
     bool result;
     if (ctx->callData->thisObject.isBoolean()) {
@@ -93,7 +93,7 @@ ReturnedValue BooleanPrototype::method_toString(SimpleCallContext *ctx)
     return Encode(ctx->engine->newString(QLatin1String(result ? "true" : "false")));
 }
 
-ReturnedValue BooleanPrototype::method_valueOf(SimpleCallContext *ctx)
+ReturnedValue BooleanPrototype::method_valueOf(CallContext *ctx)
 {
     if (ctx->callData->thisObject.isBoolean())
         return ctx->callData->thisObject.asReturnedValue();
diff --git a/src/qml/jsruntime/qv4booleanobject_p.h b/src/qml/jsruntime/qv4booleanobject_p.h
index 6766fae830..56c00f99ed 100644
--- a/src/qml/jsruntime/qv4booleanobject_p.h
+++ b/src/qml/jsruntime/qv4booleanobject_p.h
@@ -63,8 +63,8 @@ struct BooleanPrototype: BooleanObject
     BooleanPrototype(InternalClass *ic): BooleanObject(ic) {}
     void init(ExecutionEngine *engine, ObjectRef ctor);
 
-    static ReturnedValue method_toString(SimpleCallContext *ctx);
-    static ReturnedValue method_valueOf(SimpleCallContext *ctx);
+    static ReturnedValue method_toString(CallContext *ctx);
+    static ReturnedValue method_valueOf(CallContext *ctx);
 };
 
 
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index 07a5f90136..18b0de3077 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -51,47 +51,6 @@
 
 using namespace QV4;
 
-CallContext *ExecutionContext::newCallContext(void *stackSpace, SafeValue *locals, FunctionObject *function, CallData *callData)
-{
-    CallContext *c = (CallContext *)stackSpace;
-#ifndef QT_NO_DEBUG
-    c->next = (CallContext *)0x1;
-#endif
-
-    engine->current = c;
-
-    c->initBaseContext(Type_CallContext, engine, this);
-
-    c->function = function;
-    c->callData = callData;
-
-    c->strictMode = function->strictMode;
-    c->marked = false;
-    c->outer = function->scope;
-#ifndef QT_NO_DEBUG
-    assert(c->outer->next != (ExecutionContext *)0x1);
-#endif
-
-    c->activation = 0;
-
-    if (function->function) {
-        c->compilationUnit = function->function->compilationUnit;
-        c->lookups = c->compilationUnit->runtimeLookups;
-    }
-
-    c->locals = locals;
-
-    if (callData->argc < static_cast<int>(function->formalParameterCount)) {
-#ifndef QT_NO_DEBUG
-        Q_ASSERT(function->formalParameterCount <= QV4::Global::ReservedArgumentCount);
-#endif
-        std::fill(c->callData->args + callData->argc, c->callData->args + function->formalParameterCount, Primitive::undefinedValue());
-        c->callData->argc = function->formalParameterCount;
-    }
-
-    return c;
-}
-
 CallContext *ExecutionContext::newCallContext(FunctionObject *function, CallData *callData)
 {
     CallContext *c = static_cast<CallContext *>(engine->memoryManager->allocContext(requiredMemoryForExecutionContect(function, callData->argc)));
@@ -187,22 +146,34 @@ void ExecutionContext::createMutableBinding(const StringRef name, bool deletable
 
 String * const *ExecutionContext::formals() const
 {
-    return type >= Type_CallContext ? static_cast<const CallContext *>(this)->function->formalParameterList : 0;
+    if (type < Type_SimpleCallContext)
+        return 0;
+    QV4::FunctionObject *f = static_cast<const CallContext *>(this)->function;
+    return f ? f->formalParameterList : 0;
 }
 
 unsigned int ExecutionContext::formalCount() const
 {
-    return type >= Type_CallContext ? static_cast<const CallContext *>(this)->function->formalParameterCount : 0;
+    if (type < Type_SimpleCallContext)
+        return 0;
+    QV4::FunctionObject *f = static_cast<const CallContext *>(this)->function;
+    return f ? f->formalParameterCount : 0;
 }
 
 String * const *ExecutionContext::variables() const
 {
-    return type >= Type_CallContext ? static_cast<const CallContext *>(this)->function->varList : 0;
+    if (type < Type_SimpleCallContext)
+        return 0;
+    QV4::FunctionObject *f = static_cast<const CallContext *>(this)->function;
+    return f ? f->varList : 0;
 }
 
 unsigned int ExecutionContext::variableCount() const
 {
-    return type >= Type_CallContext ? static_cast<const CallContext *>(this)->function->varCount : 0;
+    if (type < Type_SimpleCallContext)
+        return 0;
+    QV4::FunctionObject *f = static_cast<const CallContext *>(this)->function;
+    return f ? f->varCount : 0;
 }
 
 
@@ -320,9 +291,10 @@ void ExecutionContext::mark()
         return;
     marked = true;
 
-    if (type != Type_SimpleCallContext && outer)
+    if (outer)
         outer->mark();
 
+    // ### shouldn't need these 3 lines
     callData->thisObject.mark(engine);
     for (int arg = 0; arg < callData->argc; ++arg)
         callData->args[arg].mark(engine);
@@ -613,9 +585,3 @@ ReturnedValue ExecutionContext::throwURIError(const ValueRef msg)
     ScopedObject error(scope, engine->newURIErrorObject(msg));
     return throwError(error);
 }
-
-void SimpleCallContext::initSimpleCallContext(ExecutionEngine *engine)
-{
-    initBaseContext(Type_SimpleCallContext, engine, engine->current);
-    function = 0;
-}
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index de5b8f9530..9a7b9a61b2 100644
--- a/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@ -62,6 +62,7 @@ struct Function;
 };
 
 struct CallContext;
+struct CallContext;
 struct CatchContext;
 struct WithContext;
 
@@ -114,7 +115,6 @@ struct Q_QML_EXPORT ExecutionContext
         jitInstructionPointer = 0;
     }
 
-    CallContext *newCallContext(void *stackSpace, SafeValue *locals, FunctionObject *f, CallData *callData);
     CallContext *newCallContext(FunctionObject *f, CallData *callData);
     WithContext *newWithContext(ObjectRef with);
     CatchContext *newCatchContext(const StringRef exceptionVarName, const ValueRef exceptionValue);
@@ -153,22 +153,23 @@ struct Q_QML_EXPORT ExecutionContext
     inline const CallContext *asCallContext() const;
 };
 
-struct SimpleCallContext : public ExecutionContext
+struct CallContext : public ExecutionContext
 {
-    void initSimpleCallContext(ExecutionEngine *engine);
     FunctionObject *function;
     int realArgumentCount;
+    SafeValue *locals;
+    Object *activation;
 
-    inline ReturnedValue argument(int i);
-};
-
-struct CallContext : public SimpleCallContext
-{
+    void initSimpleCallContext(ExecutionEngine *engine, ExecutionContext *parent) {
+        initBaseContext(Type_SimpleCallContext, engine, parent);
+        function = 0;
+        locals = 0;
+        activation = 0;
+    }
     void initQmlContext(ExecutionContext *parentContext, ObjectRef qml, QV4::FunctionObject *function);
-    bool needsOwnArguments() const;
 
-    SafeValue *locals;
-    Object *activation;
+    inline ReturnedValue argument(int i);
+    bool needsOwnArguments() const;
 };
 
 struct GlobalContext : public ExecutionContext
@@ -195,19 +196,17 @@ struct WithContext : public ExecutionContext
 
 inline CallContext *ExecutionContext::asCallContext()
 {
-    return type >= Type_CallContext ? static_cast<CallContext *>(this) : 0;
+    return type >= Type_SimpleCallContext ? static_cast<CallContext *>(this) : 0;
 }
 
 inline const CallContext *ExecutionContext::asCallContext() const
 {
-    return type >= Type_CallContext ? static_cast<const CallContext *>(this) : 0;
+    return type >= Type_SimpleCallContext ? static_cast<const CallContext *>(this) : 0;
 }
 
 /* Function *f, int argc */
 #define requiredMemoryForExecutionContect(f, argc) \
     sizeof(CallContext) + sizeof(Value) * (f->varCount + qMax((uint)argc, f->formalParameterCount)) + sizeof(CallData)
-#define requiredMemoryForExecutionContectSimple(f) \
-    sizeof(CallContext)
 
 } // namespace QV4
 
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
index aee4917842..b732c8a04a 100644
--- a/src/qml/jsruntime/qv4dateobject.cpp
+++ b/src/qml/jsruntime/qv4dateobject.cpp
@@ -779,14 +779,14 @@ double DatePrototype::getThisDate(ExecutionContext *ctx)
     }
 }
 
-ReturnedValue DatePrototype::method_parse(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_parse(CallContext *ctx)
 {
     if (!ctx->callData->argc)
         return Encode(qSNaN());
     return Encode(ParseString(ctx->callData->args[0].toString(ctx)->toQString()));
 }
 
-ReturnedValue DatePrototype::method_UTC(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_UTC(CallContext *ctx)
 {
     const int numArgs = ctx->callData->argc;
     if (numArgs >= 2) {
@@ -806,62 +806,62 @@ ReturnedValue DatePrototype::method_UTC(SimpleCallContext *ctx)
     return Encode::undefined();
 }
 
-ReturnedValue DatePrototype::method_now(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_now(CallContext *ctx)
 {
     Q_UNUSED(ctx);
     double t = currentTime();
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_toString(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_toString(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     return ctx->engine->newString(ToString(t))->asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_toDateString(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_toDateString(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     return ctx->engine->newString(ToDateString(t))->asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_toTimeString(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_toTimeString(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     return ctx->engine->newString(ToTimeString(t))->asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_toLocaleString(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_toLocaleString(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     return ctx->engine->newString(ToLocaleString(t))->asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_toLocaleDateString(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_toLocaleDateString(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     return ctx->engine->newString(ToLocaleDateString(t))->asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_toLocaleTimeString(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_toLocaleTimeString(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     return ctx->engine->newString(ToLocaleTimeString(t))->asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_valueOf(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_valueOf(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getTime(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getTime(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getYear(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getYear(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -869,7 +869,7 @@ ReturnedValue DatePrototype::method_getYear(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getFullYear(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getFullYear(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -877,7 +877,7 @@ ReturnedValue DatePrototype::method_getFullYear(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getUTCFullYear(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getUTCFullYear(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -885,7 +885,7 @@ ReturnedValue DatePrototype::method_getUTCFullYear(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getMonth(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getMonth(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -893,7 +893,7 @@ ReturnedValue DatePrototype::method_getMonth(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getUTCMonth(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getUTCMonth(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -901,7 +901,7 @@ ReturnedValue DatePrototype::method_getUTCMonth(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getDate(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getDate(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -909,7 +909,7 @@ ReturnedValue DatePrototype::method_getDate(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getUTCDate(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getUTCDate(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -917,7 +917,7 @@ ReturnedValue DatePrototype::method_getUTCDate(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getDay(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getDay(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -925,7 +925,7 @@ ReturnedValue DatePrototype::method_getDay(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getUTCDay(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getUTCDay(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -933,7 +933,7 @@ ReturnedValue DatePrototype::method_getUTCDay(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getHours(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getHours(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -941,7 +941,7 @@ ReturnedValue DatePrototype::method_getHours(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getUTCHours(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getUTCHours(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -949,7 +949,7 @@ ReturnedValue DatePrototype::method_getUTCHours(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getMinutes(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getMinutes(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -957,7 +957,7 @@ ReturnedValue DatePrototype::method_getMinutes(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getUTCMinutes(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getUTCMinutes(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -965,7 +965,7 @@ ReturnedValue DatePrototype::method_getUTCMinutes(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getSeconds(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getSeconds(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -973,7 +973,7 @@ ReturnedValue DatePrototype::method_getSeconds(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getUTCSeconds(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getUTCSeconds(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -981,7 +981,7 @@ ReturnedValue DatePrototype::method_getUTCSeconds(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getMilliseconds(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getMilliseconds(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -989,7 +989,7 @@ ReturnedValue DatePrototype::method_getMilliseconds(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getUTCMilliseconds(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getUTCMilliseconds(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -997,7 +997,7 @@ ReturnedValue DatePrototype::method_getUTCMilliseconds(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_getTimezoneOffset(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_getTimezoneOffset(CallContext *ctx)
 {
     double t = getThisDate(ctx);
     if (! std::isnan(t))
@@ -1005,7 +1005,7 @@ ReturnedValue DatePrototype::method_getTimezoneOffset(SimpleCallContext *ctx)
     return Encode(t);
 }
 
-ReturnedValue DatePrototype::method_setTime(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setTime(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<DateObject> self(scope, ctx->callData->thisObject);
@@ -1017,7 +1017,7 @@ ReturnedValue DatePrototype::method_setTime(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setMilliseconds(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setMilliseconds(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<DateObject> self(scope, ctx->callData->thisObject);
@@ -1030,7 +1030,7 @@ ReturnedValue DatePrototype::method_setMilliseconds(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setUTCMilliseconds(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setUTCMilliseconds(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1042,7 +1042,7 @@ ReturnedValue DatePrototype::method_setUTCMilliseconds(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setSeconds(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setSeconds(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1056,7 +1056,7 @@ ReturnedValue DatePrototype::method_setSeconds(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setUTCSeconds(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setUTCSeconds(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1070,7 +1070,7 @@ ReturnedValue DatePrototype::method_setUTCSeconds(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setMinutes(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setMinutes(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1085,7 +1085,7 @@ ReturnedValue DatePrototype::method_setMinutes(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setUTCMinutes(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setUTCMinutes(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1100,7 +1100,7 @@ ReturnedValue DatePrototype::method_setUTCMinutes(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setHours(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setHours(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1116,7 +1116,7 @@ ReturnedValue DatePrototype::method_setHours(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setUTCHours(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setUTCHours(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1132,7 +1132,7 @@ ReturnedValue DatePrototype::method_setUTCHours(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setDate(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setDate(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1145,7 +1145,7 @@ ReturnedValue DatePrototype::method_setDate(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setUTCDate(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setUTCDate(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1158,7 +1158,7 @@ ReturnedValue DatePrototype::method_setUTCDate(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setMonth(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setMonth(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1172,7 +1172,7 @@ ReturnedValue DatePrototype::method_setMonth(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setUTCMonth(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setUTCMonth(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1186,7 +1186,7 @@ ReturnedValue DatePrototype::method_setUTCMonth(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setYear(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setYear(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1212,7 +1212,7 @@ ReturnedValue DatePrototype::method_setYear(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setUTCFullYear(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setUTCFullYear(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1227,7 +1227,7 @@ ReturnedValue DatePrototype::method_setUTCFullYear(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_setFullYear(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_setFullYear(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1244,7 +1244,7 @@ ReturnedValue DatePrototype::method_setFullYear(SimpleCallContext *ctx)
     return self->value.asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_toUTCString(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_toUTCString(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1267,7 +1267,7 @@ static void addZeroPrefixedInt(QString &str, int num, int nDigits)
     }
 }
 
-ReturnedValue DatePrototype::method_toISOString(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_toISOString(CallContext *ctx)
 {
     DateObject *self = ctx->callData->thisObject.asDateObject();
     if (!self)
@@ -1305,7 +1305,7 @@ ReturnedValue DatePrototype::method_toISOString(SimpleCallContext *ctx)
     return ctx->engine->newString(result)->asReturnedValue();
 }
 
-ReturnedValue DatePrototype::method_toJSON(SimpleCallContext *ctx)
+ReturnedValue DatePrototype::method_toJSON(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedValue O(scope, __qmljs_to_object(ctx, ValueRef(&ctx->callData->thisObject)));
diff --git a/src/qml/jsruntime/qv4dateobject_p.h b/src/qml/jsruntime/qv4dateobject_p.h
index 5cd03024c5..e96cac2f20 100644
--- a/src/qml/jsruntime/qv4dateobject_p.h
+++ b/src/qml/jsruntime/qv4dateobject_p.h
@@ -87,55 +87,55 @@ struct DatePrototype: DateObject
 
     static double getThisDate(ExecutionContext *ctx);
 
-    static ReturnedValue method_parse(SimpleCallContext *ctx);
-    static ReturnedValue method_UTC(SimpleCallContext *ctx);
-    static ReturnedValue method_now(SimpleCallContext *ctx);
-
-    static ReturnedValue method_toString(SimpleCallContext *ctx);
-    static ReturnedValue method_toDateString(SimpleCallContext *ctx);
-    static ReturnedValue method_toTimeString(SimpleCallContext *ctx);
-    static ReturnedValue method_toLocaleString(SimpleCallContext *ctx);
-    static ReturnedValue method_toLocaleDateString(SimpleCallContext *ctx);
-    static ReturnedValue method_toLocaleTimeString(SimpleCallContext *ctx);
-    static ReturnedValue method_valueOf(SimpleCallContext *ctx);
-    static ReturnedValue method_getTime(SimpleCallContext *ctx);
-    static ReturnedValue method_getYear(SimpleCallContext *ctx);
-    static ReturnedValue method_getFullYear(SimpleCallContext *ctx);
-    static ReturnedValue method_getUTCFullYear(SimpleCallContext *ctx);
-    static ReturnedValue method_getMonth(SimpleCallContext *ctx);
-    static ReturnedValue method_getUTCMonth(SimpleCallContext *ctx);
-    static ReturnedValue method_getDate(SimpleCallContext *ctx);
-    static ReturnedValue method_getUTCDate(SimpleCallContext *ctx);
-    static ReturnedValue method_getDay(SimpleCallContext *ctx);
-    static ReturnedValue method_getUTCDay(SimpleCallContext *ctx);
-    static ReturnedValue method_getHours(SimpleCallContext *ctx);
-    static ReturnedValue method_getUTCHours(SimpleCallContext *ctx);
-    static ReturnedValue method_getMinutes(SimpleCallContext *ctx);
-    static ReturnedValue method_getUTCMinutes(SimpleCallContext *ctx);
-    static ReturnedValue method_getSeconds(SimpleCallContext *ctx);
-    static ReturnedValue method_getUTCSeconds(SimpleCallContext *ctx);
-    static ReturnedValue method_getMilliseconds(SimpleCallContext *ctx);
-    static ReturnedValue method_getUTCMilliseconds(SimpleCallContext *ctx);
-    static ReturnedValue method_getTimezoneOffset(SimpleCallContext *ctx);
-    static ReturnedValue method_setTime(SimpleCallContext *ctx);
-    static ReturnedValue method_setMilliseconds(SimpleCallContext *ctx);
-    static ReturnedValue method_setUTCMilliseconds(SimpleCallContext *ctx);
-    static ReturnedValue method_setSeconds(SimpleCallContext *ctx);
-    static ReturnedValue method_setUTCSeconds(SimpleCallContext *ctx);
-    static ReturnedValue method_setMinutes(SimpleCallContext *ctx);
-    static ReturnedValue method_setUTCMinutes(SimpleCallContext *ctx);
-    static ReturnedValue method_setHours(SimpleCallContext *ctx);
-    static ReturnedValue method_setUTCHours(SimpleCallContext *ctx);
-    static ReturnedValue method_setDate(SimpleCallContext *ctx);
-    static ReturnedValue method_setUTCDate(SimpleCallContext *ctx);
-    static ReturnedValue method_setMonth(SimpleCallContext *ctx);
-    static ReturnedValue method_setUTCMonth(SimpleCallContext *ctx);
-    static ReturnedValue method_setYear(SimpleCallContext *ctx);
-    static ReturnedValue method_setFullYear(SimpleCallContext *ctx);
-    static ReturnedValue method_setUTCFullYear(SimpleCallContext *ctx);
-    static ReturnedValue method_toUTCString(SimpleCallContext *ctx);
-    static ReturnedValue method_toISOString(SimpleCallContext *ctx);
-    static ReturnedValue method_toJSON(SimpleCallContext *ctx);
+    static ReturnedValue method_parse(CallContext *ctx);
+    static ReturnedValue method_UTC(CallContext *ctx);
+    static ReturnedValue method_now(CallContext *ctx);
+
+    static ReturnedValue method_toString(CallContext *ctx);
+    static ReturnedValue method_toDateString(CallContext *ctx);
+    static ReturnedValue method_toTimeString(CallContext *ctx);
+    static ReturnedValue method_toLocaleString(CallContext *ctx);
+    static ReturnedValue method_toLocaleDateString(CallContext *ctx);
+    static ReturnedValue method_toLocaleTimeString(CallContext *ctx);
+    static ReturnedValue method_valueOf(CallContext *ctx);
+    static ReturnedValue method_getTime(CallContext *ctx);
+    static ReturnedValue method_getYear(CallContext *ctx);
+    static ReturnedValue method_getFullYear(CallContext *ctx);
+    static ReturnedValue method_getUTCFullYear(CallContext *ctx);
+    static ReturnedValue method_getMonth(CallContext *ctx);
+    static ReturnedValue method_getUTCMonth(CallContext *ctx);
+    static ReturnedValue method_getDate(CallContext *ctx);
+    static ReturnedValue method_getUTCDate(CallContext *ctx);
+    static ReturnedValue method_getDay(CallContext *ctx);
+    static ReturnedValue method_getUTCDay(CallContext *ctx);
+    static ReturnedValue method_getHours(CallContext *ctx);
+    static ReturnedValue method_getUTCHours(CallContext *ctx);
+    static ReturnedValue method_getMinutes(CallContext *ctx);
+    static ReturnedValue method_getUTCMinutes(CallContext *ctx);
+    static ReturnedValue method_getSeconds(CallContext *ctx);
+    static ReturnedValue method_getUTCSeconds(CallContext *ctx);
+    static ReturnedValue method_getMilliseconds(CallContext *ctx);
+    static ReturnedValue method_getUTCMilliseconds(CallContext *ctx);
+    static ReturnedValue method_getTimezoneOffset(CallContext *ctx);
+    static ReturnedValue method_setTime(CallContext *ctx);
+    static ReturnedValue method_setMilliseconds(CallContext *ctx);
+    static ReturnedValue method_setUTCMilliseconds(CallContext *ctx);
+    static ReturnedValue method_setSeconds(CallContext *ctx);
+    static ReturnedValue method_setUTCSeconds(CallContext *ctx);
+    static ReturnedValue method_setMinutes(CallContext *ctx);
+    static ReturnedValue method_setUTCMinutes(CallContext *ctx);
+    static ReturnedValue method_setHours(CallContext *ctx);
+    static ReturnedValue method_setUTCHours(CallContext *ctx);
+    static ReturnedValue method_setDate(CallContext *ctx);
+    static ReturnedValue method_setUTCDate(CallContext *ctx);
+    static ReturnedValue method_setMonth(CallContext *ctx);
+    static ReturnedValue method_setUTCMonth(CallContext *ctx);
+    static ReturnedValue method_setYear(CallContext *ctx);
+    static ReturnedValue method_setFullYear(CallContext *ctx);
+    static ReturnedValue method_setUTCFullYear(CallContext *ctx);
+    static ReturnedValue method_toUTCString(CallContext *ctx);
+    static ReturnedValue method_toISOString(CallContext *ctx);
+    static ReturnedValue method_toJSON(CallContext *ctx);
 
     static void timezoneUpdated();
 };
diff --git a/src/qml/jsruntime/qv4debugging.cpp b/src/qml/jsruntime/qv4debugging.cpp
index a9fc050483..0d2a9225da 100644
--- a/src/qml/jsruntime/qv4debugging.cpp
+++ b/src/qml/jsruntime/qv4debugging.cpp
@@ -125,7 +125,8 @@ Debugger::ExecutionState Debugger::currentExecutionState(const uchar *code) cons
 
     QV4::ExecutionContext *context = m_engine->current;
     QV4::Function *function = 0;
-    if (CallContext *callCtx = context->asCallContext())
+    CallContext *callCtx = context->asCallContext();
+    if (callCtx && callCtx->function)
         function = callCtx->function->function;
     else {
         Q_ASSERT(context->type == QV4::ExecutionContext::Type_GlobalContext);
@@ -230,7 +231,8 @@ void Debugger::convert(ValueRef v, QVariant *varValue, VarInfo::Type *type) cons
 static CallContext *findContext(ExecutionContext *ctxt, int frame)
 {
     while (ctxt) {
-        if (CallContext *cCtxt = ctxt->asCallContext()) {
+        CallContext *cCtxt = ctxt->asCallContext();
+        if (cCtxt && cCtxt->function) {
             if (frame < 1)
                 return cCtxt;
             --frame;
@@ -299,9 +301,10 @@ QList<Debugger::VarInfo> Debugger::retrieveLocalsFromContext(const QStringList &
     if (frame < 0)
         return args;
 
-    CallContext *ctxt = findContext(m_engine->current, frame);
-    if (!ctxt)
+    CallContext *sctxt = findContext(m_engine->current, frame);
+    if (!sctxt || sctxt->type < ExecutionContext::Type_SimpleCallContext)
         return args;
+    CallContext *ctxt = static_cast<CallContext *>(sctxt);
 
     Scope scope(m_engine);
     ScopedValue v(scope);
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 5d22dde98c..8da593f8e3 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -78,7 +78,7 @@ using namespace QV4;
 
 static QBasicAtomicInt engineSerial = Q_BASIC_ATOMIC_INITIALIZER(1);
 
-static ReturnedValue throwTypeError(SimpleCallContext *ctx)
+static ReturnedValue throwTypeError(CallContext *ctx)
 {
     return ctx->throwTypeError();
 }
@@ -359,7 +359,7 @@ ExecutionContext *ExecutionEngine::pushGlobalContext()
     return current;
 }
 
-Returned<FunctionObject> *ExecutionEngine::newBuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(SimpleCallContext *))
+Returned<FunctionObject> *ExecutionEngine::newBuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(CallContext *))
 {
     BuiltinFunction *f = new (memoryManager) BuiltinFunction(scope, name, code);
     return f->asReturned<FunctionObject>();
@@ -546,7 +546,7 @@ Returned<Object> *ExecutionEngine::qmlContextObject() const
 {
     ExecutionContext *ctx = current;
 
-    if (ctx->type == QV4::ExecutionContext::Type_SimpleCallContext)
+    if (ctx->type == QV4::ExecutionContext::Type_SimpleCallContext && !ctx->outer)
         ctx = ctx->parent;
 
     if (!ctx->outer)
@@ -555,7 +555,7 @@ Returned<Object> *ExecutionEngine::qmlContextObject() const
     while (ctx->outer && ctx->outer->type != ExecutionContext::Type_GlobalContext)
         ctx = ctx->outer;
 
-    assert(ctx);
+    Q_ASSERT(ctx);
     if (ctx->type != ExecutionContext::Type_QmlContext)
         return 0;
 
@@ -591,7 +591,8 @@ QVector<StackFrame> ExecutionEngine::stackTrace(int frameLimit) const
 
     QV4::ExecutionContext *c = current;
     while (c && frameLimit) {
-        if (CallContext *callCtx = c->asCallContext()) {
+        CallContext *callCtx = c->asCallContext();
+        if (callCtx && callCtx->function) {
             StackFrame frame;
             if (callCtx->function->function)
                 frame.source = callCtx->function->function->sourceFile();
@@ -644,7 +645,8 @@ QUrl ExecutionEngine::resolvedUrl(const QString &file)
     QUrl base;
     QV4::ExecutionContext *c = current;
     while (c) {
-        if (CallContext *callCtx = c->asCallContext()) {
+        CallContext *callCtx = c->asCallContext();
+        if (callCtx && callCtx->function) {
             if (callCtx->function->function)
                 base.setUrl(callCtx->function->function->sourceFile());
             break;
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 3413238f3d..2df148a4a8 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -271,10 +271,10 @@ struct Q_QML_EXPORT ExecutionEngine
     void enableDebugger();
 
     ExecutionContext *pushGlobalContext();
-    void pushContext(SimpleCallContext *context);
+    void pushContext(CallContext *context);
     ExecutionContext *popContext();
 
-    Returned<FunctionObject> *newBuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(SimpleCallContext *));
+    Returned<FunctionObject> *newBuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(CallContext *));
     Returned<BoundFunction> *newBoundFunction(ExecutionContext *scope, FunctionObjectRef target, const ValueRef boundThis, const QVector<SafeValue> &boundArgs);
 
     Returned<Object> *newObject();
@@ -344,7 +344,7 @@ private:
     QmlExtensions *m_qmlExtensions;
 };
 
-inline void ExecutionEngine::pushContext(SimpleCallContext *context)
+inline void ExecutionEngine::pushContext(CallContext *context)
 {
     context->parent = current;
     current = context;
diff --git a/src/qml/jsruntime/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp
index 3f75bc0c79..bac29d19e1 100644
--- a/src/qml/jsruntime/qv4errorobject.cpp
+++ b/src/qml/jsruntime/qv4errorobject.cpp
@@ -167,7 +167,7 @@ ErrorObject::ErrorObject(InternalClass *ic, const QString &message, const QStrin
     defineDefaultProperty(QStringLiteral("message"), v);
 }
 
-ReturnedValue ErrorObject::method_get_stack(SimpleCallContext *ctx)
+ReturnedValue ErrorObject::method_get_stack(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<ErrorObject> This(scope, ctx->callData->thisObject);
@@ -383,7 +383,7 @@ void ErrorPrototype::init(ExecutionEngine *engine, ObjectRef ctor, Object *obj)
     obj->defineDefaultProperty(QStringLiteral("message"), (s = engine->newString(QString())));
 }
 
-ReturnedValue ErrorPrototype::method_toString(SimpleCallContext *ctx)
+ReturnedValue ErrorPrototype::method_toString(CallContext *ctx)
 {
     Scope scope(ctx);
 
diff --git a/src/qml/jsruntime/qv4errorobject_p.h b/src/qml/jsruntime/qv4errorobject_p.h
index b46bea5231..3f4cb8fc43 100644
--- a/src/qml/jsruntime/qv4errorobject_p.h
+++ b/src/qml/jsruntime/qv4errorobject_p.h
@@ -73,7 +73,7 @@ struct ErrorObject: Object {
     StackTrace stackTrace;
     String *stack;
 
-    static ReturnedValue method_get_stack(SimpleCallContext *ctx);
+    static ReturnedValue method_get_stack(CallContext *ctx);
     static void markObjects(Managed *that, ExecutionEngine *e);
     static void destroy(Managed *that) { static_cast<ErrorObject *>(that)->~ErrorObject(); }
 };
@@ -179,7 +179,7 @@ struct ErrorPrototype: ErrorObject
     void init(ExecutionEngine *engine, ObjectRef ctor) { init(engine, ctor, this); }
 
     static void init(ExecutionEngine *engine, ObjectRef ctor, Object *obj);
-    static ReturnedValue method_toString(SimpleCallContext *ctx);
+    static ReturnedValue method_toString(CallContext *ctx);
 };
 
 struct EvalErrorPrototype: ErrorObject
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp
index 35e4202790..7841f7c331 100644
--- a/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@ -222,7 +222,10 @@ void FunctionObject::markObjects(Managed *that, ExecutionEngine *e)
 
 FunctionObject *FunctionObject::creatScriptFunction(ExecutionContext *scope, Function *function)
 {
-    if (function->needsActivation() || function->compiledFunction->nFormals > QV4::Global::ReservedArgumentCount)
+    if (function->needsActivation() ||
+        function->compiledFunction->flags & CompiledData::Function::HasCatchOrWith ||
+        function->compiledFunction->nFormals > QV4::Global::ReservedArgumentCount ||
+        function->isNamedExpression())
         return new (scope->engine->memoryManager) ScriptFunction(scope, function);
     return new (scope->engine->memoryManager) SimpleScriptFunction(scope, function);
 }
@@ -313,7 +316,7 @@ void FunctionPrototype::init(ExecutionEngine *engine, ObjectRef ctor)
 
 }
 
-ReturnedValue FunctionPrototype::method_toString(SimpleCallContext *ctx)
+ReturnedValue FunctionPrototype::method_toString(CallContext *ctx)
 {
     FunctionObject *fun = ctx->callData->thisObject.asFunctionObject();
     if (!fun)
@@ -322,7 +325,7 @@ ReturnedValue FunctionPrototype::method_toString(SimpleCallContext *ctx)
     return ctx->engine->newString(QStringLiteral("function() { [code] }"))->asReturnedValue();
 }
 
-ReturnedValue FunctionPrototype::method_apply(SimpleCallContext *ctx)
+ReturnedValue FunctionPrototype::method_apply(CallContext *ctx)
 {
     Scope scope(ctx);
     FunctionObject *o = ctx->callData->thisObject.asFunctionObject();
@@ -361,7 +364,7 @@ ReturnedValue FunctionPrototype::method_apply(SimpleCallContext *ctx)
     return o->call(callData);
 }
 
-ReturnedValue FunctionPrototype::method_call(SimpleCallContext *ctx)
+ReturnedValue FunctionPrototype::method_call(CallContext *ctx)
 {
     Scope scope(ctx);
 
@@ -378,7 +381,7 @@ ReturnedValue FunctionPrototype::method_call(SimpleCallContext *ctx)
     return o->call(callData);
 }
 
-ReturnedValue FunctionPrototype::method_bind(SimpleCallContext *ctx)
+ReturnedValue FunctionPrototype::method_bind(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<FunctionObject> target(scope, ctx->callData->thisObject);
@@ -520,29 +523,41 @@ ReturnedValue SimpleScriptFunction::construct(Managed *that, CallData *callData)
     ExecutionEngine *v4 = that->internalClass->engine;
     if (v4->hasException)
         return Encode::undefined();
-    Scope scope(v4);
 
+    Scope scope(v4);
     Scoped<SimpleScriptFunction> f(scope, static_cast<SimpleScriptFunction *>(that));
 
     InternalClass *ic = v4->objectClass;
     Scoped<Object> proto(scope, f->memberData[Index_Prototype].value);
     if (!!proto)
         ic = v4->emptyClass->changePrototype(proto.getPointer());
-    Scoped<Object> obj(scope, v4->newObject(ic));
+    callData->thisObject = v4->newObject(ic);
 
     ExecutionContext *context = v4->current;
-    void *stackSpace = alloca(requiredMemoryForExecutionContectSimple(f));
-    callData->thisObject = obj;
-    ExecutionContext *ctx = context->newCallContext(stackSpace, scope.alloc(f->varCount), f.getPointer(), callData);
+
+    CallContext ctx;
+    ctx.initSimpleCallContext(v4, context);
+    ctx.strictMode = f->strictMode;
+    ctx.callData = callData;
+    ctx.function = f.getPointer();
+    ctx.compilationUnit = f->function->compilationUnit;
+    ctx.lookups = ctx.compilationUnit->runtimeLookups;
+    ctx.outer = f->scope;
+    ctx.locals = v4->stackPush(f->function->locals.size());
+    while (callData->argc < (int)f->formalParameterCount) {
+        callData->args[callData->argc] = Encode::undefined();
+        ++callData->argc;
+    }
+    v4->pushContext(&ctx);
 
     if (f->function->compiledFunction->hasQmlDependencies())
         QmlContextWrapper::registerQmlDependencies(v4, f->function->compiledFunction);
 
     ExecutionContextSaver ctxSaver(context);
-    Scoped<Object> result(scope, f->function->code(ctx, f->function->codeData));
+    Scoped<Object> result(scope, f->function->code(&ctx, f->function->codeData));
 
     if (!result)
-        return obj.asReturnedValue();
+        return callData->thisObject.asReturnedValue();
     return result.asReturnedValue();
 }
 
@@ -552,19 +567,31 @@ ReturnedValue SimpleScriptFunction::call(Managed *that, CallData *callData)
     if (v4->hasException)
         return Encode::undefined();
 
-    Scope scope(v4);
+    SimpleScriptFunction *f = static_cast<SimpleScriptFunction *>(that);
 
-    Scoped<SimpleScriptFunction> f(scope, static_cast<SimpleScriptFunction *>(that));
-
-    void *stackSpace = alloca(requiredMemoryForExecutionContectSimple(f));
+    Scope scope(v4);
     ExecutionContext *context = v4->current;
-    ExecutionContext *ctx = context->newCallContext(stackSpace, scope.alloc(f->varCount), f.getPointer(), callData);
+
+    CallContext ctx;
+    ctx.initSimpleCallContext(v4, context);
+    ctx.strictMode = f->strictMode;
+    ctx.callData = callData;
+    ctx.function = f;
+    ctx.compilationUnit = f->function->compilationUnit;
+    ctx.lookups = ctx.compilationUnit->runtimeLookups;
+    ctx.outer = f->scope;
+    ctx.locals = v4->stackPush(f->function->locals.size());
+    while (callData->argc < (int)f->formalParameterCount) {
+        callData->args[callData->argc] = Encode::undefined();
+        ++callData->argc;
+    }
+    v4->current = &ctx;
 
     if (f->function->compiledFunction->hasQmlDependencies())
         QmlContextWrapper::registerQmlDependencies(v4, f->function->compiledFunction);
 
     ExecutionContextSaver ctxSaver(context);
-    return f->function->code(ctx, f->function->codeData);
+    return f->function->code(&ctx, f->function->codeData);
 }
 
 
@@ -572,7 +599,7 @@ ReturnedValue SimpleScriptFunction::call(Managed *that, CallData *callData)
 
 DEFINE_MANAGED_VTABLE(BuiltinFunction);
 
-BuiltinFunction::BuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(SimpleCallContext *))
+BuiltinFunction::BuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(CallContext *))
     : FunctionObject(scope, name)
     , code(code)
 {
@@ -591,12 +618,10 @@ ReturnedValue BuiltinFunction::call(Managed *that, CallData *callData)
     if (v4->hasException)
         return Encode::undefined();
 
-    Scope scope(v4);
-
     ExecutionContext *context = v4->current;
 
-    SimpleCallContext ctx;
-    ctx.initSimpleCallContext(f->scope->engine);
+    CallContext ctx;
+    ctx.initSimpleCallContext(v4, context);
     ctx.strictMode = f->scope->strictMode; // ### needed? scope or parent context?
     ctx.callData = callData;
     v4->pushContext(&ctx);
@@ -614,8 +639,8 @@ ReturnedValue IndexedBuiltinFunction::call(Managed *that, CallData *callData)
     ExecutionContext *context = v4->current;
     Scope scope(v4);
 
-    SimpleCallContext ctx;
-    ctx.initSimpleCallContext(f->scope->engine);
+    CallContext ctx;
+    ctx.initSimpleCallContext(v4, context);
     ctx.strictMode = f->scope->strictMode; // ### needed? scope or parent context?
     ctx.callData = callData;
     v4->pushContext(&ctx);
diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index 3f526947a0..2fc36d862f 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -164,17 +164,17 @@ struct FunctionPrototype: FunctionObject
     FunctionPrototype(InternalClass *ic);
     void init(ExecutionEngine *engine, ObjectRef ctor);
 
-    static ReturnedValue method_toString(SimpleCallContext *ctx);
-    static ReturnedValue method_apply(SimpleCallContext *ctx);
-    static ReturnedValue method_call(SimpleCallContext *ctx);
-    static ReturnedValue method_bind(SimpleCallContext *ctx);
+    static ReturnedValue method_toString(CallContext *ctx);
+    static ReturnedValue method_apply(CallContext *ctx);
+    static ReturnedValue method_call(CallContext *ctx);
+    static ReturnedValue method_bind(CallContext *ctx);
 };
 
 struct BuiltinFunction: FunctionObject {
     Q_MANAGED
-    ReturnedValue (*code)(SimpleCallContext *);
+    ReturnedValue (*code)(CallContext *);
 
-    BuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(SimpleCallContext *));
+    BuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(CallContext *));
 
     static ReturnedValue construct(Managed *, CallData *);
     static ReturnedValue call(Managed *that, CallData *callData);
@@ -184,10 +184,10 @@ struct IndexedBuiltinFunction: FunctionObject
 {
     Q_MANAGED
 
-    ReturnedValue (*code)(SimpleCallContext *ctx, uint index);
+    ReturnedValue (*code)(CallContext *ctx, uint index);
     uint index;
 
-    IndexedBuiltinFunction(ExecutionContext *scope, uint index, ReturnedValue (*code)(SimpleCallContext *ctx, uint index))
+    IndexedBuiltinFunction(ExecutionContext *scope, uint index, ReturnedValue (*code)(CallContext *ctx, uint index))
         : FunctionObject(scope)
         , code(code)
         , index(index)
diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp
index 3ded454f2e..82622de5bb 100644
--- a/src/qml/jsruntime/qv4globalobject.cpp
+++ b/src/qml/jsruntime/qv4globalobject.cpp
@@ -459,7 +459,7 @@ static inline int toInt(const QChar &qc, int R)
 }
 
 // parseInt [15.1.2.2]
-ReturnedValue GlobalFunctions::method_parseInt(SimpleCallContext *ctx)
+ReturnedValue GlobalFunctions::method_parseInt(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedValue string(scope, ctx->argument(0));
@@ -543,7 +543,7 @@ ReturnedValue GlobalFunctions::method_parseInt(SimpleCallContext *ctx)
 }
 
 // parseFloat [15.1.2.3]
-ReturnedValue GlobalFunctions::method_parseFloat(SimpleCallContext *ctx)
+ReturnedValue GlobalFunctions::method_parseFloat(CallContext *ctx)
 {
     Scope scope(ctx);
 
@@ -572,7 +572,7 @@ ReturnedValue GlobalFunctions::method_parseFloat(SimpleCallContext *ctx)
 }
 
 /// isNaN [15.1.2.4]
-ReturnedValue GlobalFunctions::method_isNaN(SimpleCallContext *ctx)
+ReturnedValue GlobalFunctions::method_isNaN(CallContext *ctx)
 {
     if (!ctx->callData->argc)
         // undefined gets converted to NaN
@@ -586,7 +586,7 @@ ReturnedValue GlobalFunctions::method_isNaN(SimpleCallContext *ctx)
 }
 
 /// isFinite [15.1.2.5]
-ReturnedValue GlobalFunctions::method_isFinite(SimpleCallContext *ctx)
+ReturnedValue GlobalFunctions::method_isFinite(CallContext *ctx)
 {
     if (!ctx->callData->argc)
         // undefined gets converted to NaN
@@ -600,7 +600,7 @@ ReturnedValue GlobalFunctions::method_isFinite(SimpleCallContext *ctx)
 }
 
 /// decodeURI [15.1.3.1]
-ReturnedValue GlobalFunctions::method_decodeURI(SimpleCallContext *context)
+ReturnedValue GlobalFunctions::method_decodeURI(CallContext *context)
 {
     if (context->callData->argc == 0)
         return Encode::undefined();
@@ -618,7 +618,7 @@ ReturnedValue GlobalFunctions::method_decodeURI(SimpleCallContext *context)
 }
 
 /// decodeURIComponent [15.1.3.2]
-ReturnedValue GlobalFunctions::method_decodeURIComponent(SimpleCallContext *context)
+ReturnedValue GlobalFunctions::method_decodeURIComponent(CallContext *context)
 {
     if (context->callData->argc == 0)
         return Encode::undefined();
@@ -636,7 +636,7 @@ ReturnedValue GlobalFunctions::method_decodeURIComponent(SimpleCallContext *cont
 }
 
 /// encodeURI [15.1.3.3]
-ReturnedValue GlobalFunctions::method_encodeURI(SimpleCallContext *context)
+ReturnedValue GlobalFunctions::method_encodeURI(CallContext *context)
 {
     if (context->callData->argc == 0)
         return Encode::undefined();
@@ -654,7 +654,7 @@ ReturnedValue GlobalFunctions::method_encodeURI(SimpleCallContext *context)
 }
 
 /// encodeURIComponent [15.1.3.4]
-ReturnedValue GlobalFunctions::method_encodeURIComponent(SimpleCallContext *context)
+ReturnedValue GlobalFunctions::method_encodeURIComponent(CallContext *context)
 {
     if (context->callData->argc == 0)
         return Encode::undefined();
@@ -671,7 +671,7 @@ ReturnedValue GlobalFunctions::method_encodeURIComponent(SimpleCallContext *cont
     return context->engine->newString(out)->asReturnedValue();
 }
 
-ReturnedValue GlobalFunctions::method_escape(SimpleCallContext *context)
+ReturnedValue GlobalFunctions::method_escape(CallContext *context)
 {
     if (!context->callData->argc)
         return context->engine->newString(QStringLiteral("undefined"))->asReturnedValue();
@@ -680,7 +680,7 @@ ReturnedValue GlobalFunctions::method_escape(SimpleCallContext *context)
     return context->engine->newString(escape(str))->asReturnedValue();
 }
 
-ReturnedValue GlobalFunctions::method_unescape(SimpleCallContext *context)
+ReturnedValue GlobalFunctions::method_unescape(CallContext *context)
 {
     if (!context->callData->argc)
         return context->engine->newString(QStringLiteral("undefined"))->asReturnedValue();
diff --git a/src/qml/jsruntime/qv4globalobject_p.h b/src/qml/jsruntime/qv4globalobject_p.h
index e6a3b0d773..bf529a465d 100644
--- a/src/qml/jsruntime/qv4globalobject_p.h
+++ b/src/qml/jsruntime/qv4globalobject_p.h
@@ -61,16 +61,16 @@ struct Q_QML_EXPORT EvalFunction : FunctionObject
 
 struct GlobalFunctions
 {
-    static ReturnedValue method_parseInt(SimpleCallContext *context);
-    static ReturnedValue method_parseFloat(SimpleCallContext *context);
-    static ReturnedValue method_isNaN(SimpleCallContext *context);
-    static ReturnedValue method_isFinite(SimpleCallContext *ctx);
-    static ReturnedValue method_decodeURI(SimpleCallContext *context);
-    static ReturnedValue method_decodeURIComponent(SimpleCallContext *context);
-    static ReturnedValue method_encodeURI(SimpleCallContext *context);
-    static ReturnedValue method_encodeURIComponent(SimpleCallContext *context);
-    static ReturnedValue method_escape(SimpleCallContext *context);
-    static ReturnedValue method_unescape(SimpleCallContext *context);
+    static ReturnedValue method_parseInt(CallContext *context);
+    static ReturnedValue method_parseFloat(CallContext *context);
+    static ReturnedValue method_isNaN(CallContext *context);
+    static ReturnedValue method_isFinite(CallContext *ctx);
+    static ReturnedValue method_decodeURI(CallContext *context);
+    static ReturnedValue method_decodeURIComponent(CallContext *context);
+    static ReturnedValue method_encodeURI(CallContext *context);
+    static ReturnedValue method_encodeURIComponent(CallContext *context);
+    static ReturnedValue method_escape(CallContext *context);
+    static ReturnedValue method_unescape(CallContext *context);
 };
 
 }
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index f156065125..8f2548064a 100644
--- a/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@ -179,7 +179,7 @@ void QV4Include::finished()
 /*
     Documented in qv8engine.cpp
 */
-QV4::ReturnedValue QV4Include::method_include(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QV4Include::method_include(QV4::CallContext *ctx)
 {
     if (!ctx->callData->argc)
         return QV4::Encode::undefined();
diff --git a/src/qml/jsruntime/qv4include_p.h b/src/qml/jsruntime/qv4include_p.h
index 49d65e2149..c4c72f3a83 100644
--- a/src/qml/jsruntime/qv4include_p.h
+++ b/src/qml/jsruntime/qv4include_p.h
@@ -78,7 +78,7 @@ public:
         Exception = 3
     };
 
-    static QV4::ReturnedValue method_include(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_include(QV4::CallContext *ctx);
 
 private Q_SLOTS:
     void finished();
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp
index c4d1ebc545..2fa5a7c0bc 100644
--- a/src/qml/jsruntime/qv4jsonobject.cpp
+++ b/src/qml/jsruntime/qv4jsonobject.cpp
@@ -893,7 +893,7 @@ JsonObject::JsonObject(ExecutionEngine *engine)
 }
 
 
-ReturnedValue JsonObject::method_parse(SimpleCallContext *ctx)
+ReturnedValue JsonObject::method_parse(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedValue v(scope, ctx->argument(0));
@@ -911,7 +911,7 @@ ReturnedValue JsonObject::method_parse(SimpleCallContext *ctx)
     return result.asReturnedValue();
 }
 
-ReturnedValue JsonObject::method_stringify(SimpleCallContext *ctx)
+ReturnedValue JsonObject::method_stringify(CallContext *ctx)
 {
     Scope scope(ctx);
 
diff --git a/src/qml/jsruntime/qv4jsonobject_p.h b/src/qml/jsruntime/qv4jsonobject_p.h
index bdce810680..f63e7726f5 100644
--- a/src/qml/jsruntime/qv4jsonobject_p.h
+++ b/src/qml/jsruntime/qv4jsonobject_p.h
@@ -56,8 +56,8 @@ private:
 public:
     JsonObject(ExecutionEngine *engine);
 
-    static ReturnedValue method_parse(SimpleCallContext *ctx);
-    static ReturnedValue method_stringify(SimpleCallContext *ctx);
+    static ReturnedValue method_parse(CallContext *ctx);
+    static ReturnedValue method_stringify(CallContext *ctx);
 
     static ReturnedValue fromJsonValue(ExecutionEngine *engine, const QJsonValue &value);
     static ReturnedValue fromJsonObject(ExecutionEngine *engine, const QJsonObject &object);
diff --git a/src/qml/jsruntime/qv4mathobject.cpp b/src/qml/jsruntime/qv4mathobject.cpp
index d5a1a88dc5..5a7af1f041 100644
--- a/src/qml/jsruntime/qv4mathobject.cpp
+++ b/src/qml/jsruntime/qv4mathobject.cpp
@@ -102,7 +102,7 @@ static double copySign(double x, double y)
     return x;
 }
 
-ReturnedValue MathObject::method_abs(SimpleCallContext *context)
+ReturnedValue MathObject::method_abs(CallContext *context)
 {
     if (!context->callData->argc)
         return Encode(qSNaN());
@@ -119,7 +119,7 @@ ReturnedValue MathObject::method_abs(SimpleCallContext *context)
     return Encode(v < 0 ? -v : v);
 }
 
-ReturnedValue MathObject::method_acos(SimpleCallContext *context)
+ReturnedValue MathObject::method_acos(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : 2;
     if (v > 1)
@@ -128,7 +128,7 @@ ReturnedValue MathObject::method_acos(SimpleCallContext *context)
     return Encode(::acos(v));
 }
 
-ReturnedValue MathObject::method_asin(SimpleCallContext *context)
+ReturnedValue MathObject::method_asin(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : 2;
     if (v > 1)
@@ -137,7 +137,7 @@ ReturnedValue MathObject::method_asin(SimpleCallContext *context)
         return Encode(::asin(v));
 }
 
-ReturnedValue MathObject::method_atan(SimpleCallContext *context)
+ReturnedValue MathObject::method_atan(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     if (v == 0.0)
@@ -146,7 +146,7 @@ ReturnedValue MathObject::method_atan(SimpleCallContext *context)
         return Encode(::atan(v));
 }
 
-ReturnedValue MathObject::method_atan2(SimpleCallContext *context)
+ReturnedValue MathObject::method_atan2(CallContext *context)
 {
     double v1 = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     double v2 = context->callData->argc > 1 ? context->callData->args[1].toNumber() : qSNaN();
@@ -164,7 +164,7 @@ ReturnedValue MathObject::method_atan2(SimpleCallContext *context)
     return Encode(::atan2(v1, v2));
 }
 
-ReturnedValue MathObject::method_ceil(SimpleCallContext *context)
+ReturnedValue MathObject::method_ceil(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     if (v < 0.0 && v > -1.0)
@@ -173,13 +173,13 @@ ReturnedValue MathObject::method_ceil(SimpleCallContext *context)
         return Encode(::ceil(v));
 }
 
-ReturnedValue MathObject::method_cos(SimpleCallContext *context)
+ReturnedValue MathObject::method_cos(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     return Encode(::cos(v));
 }
 
-ReturnedValue MathObject::method_exp(SimpleCallContext *context)
+ReturnedValue MathObject::method_exp(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     if (qIsInf(v)) {
@@ -192,13 +192,13 @@ ReturnedValue MathObject::method_exp(SimpleCallContext *context)
     }
 }
 
-ReturnedValue MathObject::method_floor(SimpleCallContext *context)
+ReturnedValue MathObject::method_floor(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     return Encode(::floor(v));
 }
 
-ReturnedValue MathObject::method_log(SimpleCallContext *context)
+ReturnedValue MathObject::method_log(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     if (v < 0)
@@ -207,7 +207,7 @@ ReturnedValue MathObject::method_log(SimpleCallContext *context)
         return Encode(::log(v));
 }
 
-ReturnedValue MathObject::method_max(SimpleCallContext *context)
+ReturnedValue MathObject::method_max(CallContext *context)
 {
     double mx = -qInf();
     for (int i = 0; i < context->callData->argc; ++i) {
@@ -218,7 +218,7 @@ ReturnedValue MathObject::method_max(SimpleCallContext *context)
     return Encode(mx);
 }
 
-ReturnedValue MathObject::method_min(SimpleCallContext *context)
+ReturnedValue MathObject::method_min(CallContext *context)
 {
     double mx = qInf();
     for (int i = 0; i < context->callData->argc; ++i) {
@@ -231,7 +231,7 @@ ReturnedValue MathObject::method_min(SimpleCallContext *context)
     return Encode(mx);
 }
 
-ReturnedValue MathObject::method_pow(SimpleCallContext *context)
+ReturnedValue MathObject::method_pow(CallContext *context)
 {
     double x = context->callData->argc > 0 ? context->callData->args[0].toNumber() : qSNaN();
     double y = context->callData->argc > 1 ? context->callData->args[1].toNumber() : qSNaN();
@@ -283,7 +283,7 @@ ReturnedValue MathObject::method_pow(SimpleCallContext *context)
 
 Q_GLOBAL_STATIC(QThreadStorage<bool *>, seedCreatedStorage);
 
-ReturnedValue MathObject::method_random(SimpleCallContext *context)
+ReturnedValue MathObject::method_random(CallContext *context)
 {
     if (!seedCreatedStorage()->hasLocalData()) {
         qsrand(QTime(0,0,0).msecsTo(QTime::currentTime()) ^ reinterpret_cast<quintptr>(context));
@@ -292,26 +292,26 @@ ReturnedValue MathObject::method_random(SimpleCallContext *context)
     return Encode(qrand() / (double) RAND_MAX);
 }
 
-ReturnedValue MathObject::method_round(SimpleCallContext *context)
+ReturnedValue MathObject::method_round(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     v = copySign(::floor(v + 0.5), v);
     return Encode(v);
 }
 
-ReturnedValue MathObject::method_sin(SimpleCallContext *context)
+ReturnedValue MathObject::method_sin(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     return Encode(::sin(v));
 }
 
-ReturnedValue MathObject::method_sqrt(SimpleCallContext *context)
+ReturnedValue MathObject::method_sqrt(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     return Encode(::sqrt(v));
 }
 
-ReturnedValue MathObject::method_tan(SimpleCallContext *context)
+ReturnedValue MathObject::method_tan(CallContext *context)
 {
     double v = context->callData->argc ? context->callData->args[0].toNumber() : qSNaN();
     if (v == 0.0)
diff --git a/src/qml/jsruntime/qv4mathobject_p.h b/src/qml/jsruntime/qv4mathobject_p.h
index b65264b5dd..dca75e6c28 100644
--- a/src/qml/jsruntime/qv4mathobject_p.h
+++ b/src/qml/jsruntime/qv4mathobject_p.h
@@ -51,24 +51,24 @@ struct MathObject: Object
 {
     MathObject(ExecutionEngine *engine);
 
-    static ReturnedValue method_abs(SimpleCallContext *context);
-    static ReturnedValue method_acos(SimpleCallContext *context);
-    static ReturnedValue method_asin(SimpleCallContext *context);
-    static ReturnedValue method_atan(SimpleCallContext *context);
-    static ReturnedValue method_atan2(SimpleCallContext *context);
-    static ReturnedValue method_ceil(SimpleCallContext *context);
-    static ReturnedValue method_cos(SimpleCallContext *context);
-    static ReturnedValue method_exp(SimpleCallContext *context);
-    static ReturnedValue method_floor(SimpleCallContext *context);
-    static ReturnedValue method_log(SimpleCallContext *context);
-    static ReturnedValue method_max(SimpleCallContext *context);
-    static ReturnedValue method_min(SimpleCallContext *context);
-    static ReturnedValue method_pow(SimpleCallContext *context);
-    static ReturnedValue method_random(SimpleCallContext *context);
-    static ReturnedValue method_round(SimpleCallContext *context);
-    static ReturnedValue method_sin(SimpleCallContext *context);
-    static ReturnedValue method_sqrt(SimpleCallContext *context);
-    static ReturnedValue method_tan(SimpleCallContext *context);
+    static ReturnedValue method_abs(CallContext *context);
+    static ReturnedValue method_acos(CallContext *context);
+    static ReturnedValue method_asin(CallContext *context);
+    static ReturnedValue method_atan(CallContext *context);
+    static ReturnedValue method_atan2(CallContext *context);
+    static ReturnedValue method_ceil(CallContext *context);
+    static ReturnedValue method_cos(CallContext *context);
+    static ReturnedValue method_exp(CallContext *context);
+    static ReturnedValue method_floor(CallContext *context);
+    static ReturnedValue method_log(CallContext *context);
+    static ReturnedValue method_max(CallContext *context);
+    static ReturnedValue method_min(CallContext *context);
+    static ReturnedValue method_pow(CallContext *context);
+    static ReturnedValue method_random(CallContext *context);
+    static ReturnedValue method_round(CallContext *context);
+    static ReturnedValue method_sin(CallContext *context);
+    static ReturnedValue method_sqrt(CallContext *context);
+    static ReturnedValue method_tan(CallContext *context);
 };
 
 }
diff --git a/src/qml/jsruntime/qv4numberobject.cpp b/src/qml/jsruntime/qv4numberobject.cpp
index 2000297b84..039b790aed 100644
--- a/src/qml/jsruntime/qv4numberobject.cpp
+++ b/src/qml/jsruntime/qv4numberobject.cpp
@@ -121,7 +121,7 @@ inline double thisNumber(ExecutionContext *ctx)
     return n->value.asDouble();
 }
 
-ReturnedValue NumberPrototype::method_toString(SimpleCallContext *ctx)
+ReturnedValue NumberPrototype::method_toString(CallContext *ctx)
 {
     double num = thisNumber(ctx);
     if (ctx->engine->hasException)
@@ -173,7 +173,7 @@ ReturnedValue NumberPrototype::method_toString(SimpleCallContext *ctx)
     return Primitive::fromDouble(num).toString(ctx)->asReturnedValue();
 }
 
-ReturnedValue NumberPrototype::method_toLocaleString(SimpleCallContext *ctx)
+ReturnedValue NumberPrototype::method_toLocaleString(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedValue v(scope, thisNumberValue(ctx));
@@ -183,12 +183,12 @@ ReturnedValue NumberPrototype::method_toLocaleString(SimpleCallContext *ctx)
     return str.asReturnedValue();
 }
 
-ReturnedValue NumberPrototype::method_valueOf(SimpleCallContext *ctx)
+ReturnedValue NumberPrototype::method_valueOf(CallContext *ctx)
 {
     return thisNumberValue(ctx);
 }
 
-ReturnedValue NumberPrototype::method_toFixed(SimpleCallContext *ctx)
+ReturnedValue NumberPrototype::method_toFixed(CallContext *ctx)
 {
     double v = thisNumber(ctx);
     if (ctx->engine->hasException)
@@ -217,7 +217,7 @@ ReturnedValue NumberPrototype::method_toFixed(SimpleCallContext *ctx)
     return ctx->engine->newString(str)->asReturnedValue();
 }
 
-ReturnedValue NumberPrototype::method_toExponential(SimpleCallContext *ctx)
+ReturnedValue NumberPrototype::method_toExponential(CallContext *ctx)
 {
     Scope scope(ctx);
     double d = thisNumber(ctx);
@@ -242,7 +242,7 @@ ReturnedValue NumberPrototype::method_toExponential(SimpleCallContext *ctx)
     return ctx->engine->newString(result)->asReturnedValue();
 }
 
-ReturnedValue NumberPrototype::method_toPrecision(SimpleCallContext *ctx)
+ReturnedValue NumberPrototype::method_toPrecision(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedValue v(scope, thisNumberValue(ctx));
diff --git a/src/qml/jsruntime/qv4numberobject_p.h b/src/qml/jsruntime/qv4numberobject_p.h
index a4d13267bd..1ca3a71249 100644
--- a/src/qml/jsruntime/qv4numberobject_p.h
+++ b/src/qml/jsruntime/qv4numberobject_p.h
@@ -63,12 +63,12 @@ struct NumberPrototype: NumberObject
     NumberPrototype(InternalClass *ic): NumberObject(ic) {}
     void init(ExecutionEngine *engine, ObjectRef ctor);
 
-    static ReturnedValue method_toString(SimpleCallContext *ctx);
-    static ReturnedValue method_toLocaleString(SimpleCallContext *ctx);
-    static ReturnedValue method_valueOf(SimpleCallContext *ctx);
-    static ReturnedValue method_toFixed(SimpleCallContext *ctx);
-    static ReturnedValue method_toExponential(SimpleCallContext *ctx);
-    static ReturnedValue method_toPrecision(SimpleCallContext *ctx);
+    static ReturnedValue method_toString(CallContext *ctx);
+    static ReturnedValue method_toLocaleString(CallContext *ctx);
+    static ReturnedValue method_valueOf(CallContext *ctx);
+    static ReturnedValue method_toFixed(CallContext *ctx);
+    static ReturnedValue method_toExponential(CallContext *ctx);
+    static ReturnedValue method_toPrecision(CallContext *ctx);
 };
 
 
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index 66b1b58b67..099b5a5480 100644
--- a/src/qml/jsruntime/qv4object.cpp
+++ b/src/qml/jsruntime/qv4object.cpp
@@ -187,7 +187,7 @@ void Object::defineDefaultProperty(const QString &name, ValueRef value)
     defineDefaultProperty(s, value);
 }
 
-void Object::defineDefaultProperty(const QString &name, ReturnedValue (*code)(SimpleCallContext *), int argumentCount)
+void Object::defineDefaultProperty(const QString &name, ReturnedValue (*code)(CallContext *), int argumentCount)
 {
     ExecutionEngine *e = engine();
     Scope scope(e);
@@ -197,7 +197,7 @@ void Object::defineDefaultProperty(const QString &name, ReturnedValue (*code)(Si
     defineDefaultProperty(s, function);
 }
 
-void Object::defineDefaultProperty(const StringRef name, ReturnedValue (*code)(SimpleCallContext *), int argumentCount)
+void Object::defineDefaultProperty(const StringRef name, ReturnedValue (*code)(CallContext *), int argumentCount)
 {
     ExecutionEngine *e = engine();
     Scope scope(e);
@@ -206,7 +206,7 @@ void Object::defineDefaultProperty(const StringRef name, ReturnedValue (*code)(S
     defineDefaultProperty(name, function);
 }
 
-void Object::defineAccessorProperty(const QString &name, ReturnedValue (*getter)(SimpleCallContext *), ReturnedValue (*setter)(SimpleCallContext *))
+void Object::defineAccessorProperty(const QString &name, ReturnedValue (*getter)(CallContext *), ReturnedValue (*setter)(CallContext *))
 {
     ExecutionEngine *e = engine();
     Scope scope(e);
@@ -214,7 +214,7 @@ void Object::defineAccessorProperty(const QString &name, ReturnedValue (*getter)
     defineAccessorProperty(s, getter, setter);
 }
 
-void Object::defineAccessorProperty(const StringRef name, ReturnedValue (*getter)(SimpleCallContext *), ReturnedValue (*setter)(SimpleCallContext *))
+void Object::defineAccessorProperty(const StringRef name, ReturnedValue (*getter)(CallContext *), ReturnedValue (*setter)(CallContext *))
 {
     ExecutionEngine *v4 = engine();
     Property *p = insertMember(name, QV4::Attr_Accessor|QV4::Attr_NotConfigurable|QV4::Attr_NotEnumerable);
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index 33f785ec90..daef18d4e2 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -158,10 +158,10 @@ struct Q_QML_EXPORT Object: Managed {
     /* The spec default: Writable: true, Enumerable: false, Configurable: true */
     void defineDefaultProperty(const StringRef name, ValueRef value);
     void defineDefaultProperty(const QString &name, ValueRef value);
-    void defineDefaultProperty(const QString &name, ReturnedValue (*code)(SimpleCallContext *), int argumentCount = 0);
-    void defineDefaultProperty(const StringRef name, ReturnedValue (*code)(SimpleCallContext *), int argumentCount = 0);
-    void defineAccessorProperty(const QString &name, ReturnedValue (*getter)(SimpleCallContext *), ReturnedValue (*setter)(SimpleCallContext *));
-    void defineAccessorProperty(const StringRef name, ReturnedValue (*getter)(SimpleCallContext *), ReturnedValue (*setter)(SimpleCallContext *));
+    void defineDefaultProperty(const QString &name, ReturnedValue (*code)(CallContext *), int argumentCount = 0);
+    void defineDefaultProperty(const StringRef name, ReturnedValue (*code)(CallContext *), int argumentCount = 0);
+    void defineAccessorProperty(const QString &name, ReturnedValue (*getter)(CallContext *), ReturnedValue (*setter)(CallContext *));
+    void defineAccessorProperty(const StringRef name, ReturnedValue (*getter)(CallContext *), ReturnedValue (*setter)(CallContext *));
     /* Fixed: Writable: false, Enumerable: false, Configurable: false */
     void defineReadonlyProperty(const QString &name, ValueRef value);
     void defineReadonlyProperty(const StringRef name, ValueRef value);
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp
index 2f14d8b148..4369267278 100644
--- a/src/qml/jsruntime/qv4objectproto.cpp
+++ b/src/qml/jsruntime/qv4objectproto.cpp
@@ -138,7 +138,7 @@ void ObjectPrototype::init(ExecutionEngine *v4, ObjectRef ctor)
     p->setSetter(v4->newBuiltinFunction(v4->rootContext, id_proto, method_set_proto)->getPointer());
 }
 
-ReturnedValue ObjectPrototype::method_getPrototypeOf(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_getPrototypeOf(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> o(scope, ctx->argument(0));
@@ -149,7 +149,7 @@ ReturnedValue ObjectPrototype::method_getPrototypeOf(SimpleCallContext *ctx)
     return !!p ? p->asReturnedValue() : Encode::null();
 }
 
-ReturnedValue ObjectPrototype::method_getOwnPropertyDescriptor(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_getOwnPropertyDescriptor(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> O(scope, ctx->argument(0));
@@ -165,7 +165,7 @@ ReturnedValue ObjectPrototype::method_getOwnPropertyDescriptor(SimpleCallContext
     return fromPropertyDescriptor(ctx, desc, attrs);
 }
 
-ReturnedValue ObjectPrototype::method_getOwnPropertyNames(SimpleCallContext *context)
+ReturnedValue ObjectPrototype::method_getOwnPropertyNames(CallContext *context)
 {
     Scope scope(context);
     ScopedObject O(scope, context->argument(0));
@@ -176,7 +176,7 @@ ReturnedValue ObjectPrototype::method_getOwnPropertyNames(SimpleCallContext *con
     return array.asReturnedValue();
 }
 
-ReturnedValue ObjectPrototype::method_create(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_create(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedValue O(scope, ctx->argument(0));
@@ -194,7 +194,7 @@ ReturnedValue ObjectPrototype::method_create(SimpleCallContext *ctx)
     return newObject.asReturnedValue();
 }
 
-ReturnedValue ObjectPrototype::method_defineProperty(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_defineProperty(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> O(scope, ctx->argument(0));
@@ -218,7 +218,7 @@ ReturnedValue ObjectPrototype::method_defineProperty(SimpleCallContext *ctx)
     return O.asReturnedValue();
 }
 
-ReturnedValue ObjectPrototype::method_defineProperties(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_defineProperties(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> O(scope, ctx->argument(0));
@@ -256,7 +256,7 @@ ReturnedValue ObjectPrototype::method_defineProperties(SimpleCallContext *ctx)
     return O.asReturnedValue();
 }
 
-ReturnedValue ObjectPrototype::method_seal(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_seal(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> o(scope, ctx->argument(0));
@@ -276,7 +276,7 @@ ReturnedValue ObjectPrototype::method_seal(SimpleCallContext *ctx)
     return o.asReturnedValue();
 }
 
-ReturnedValue ObjectPrototype::method_freeze(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_freeze(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> o(scope, ctx->argument(0));
@@ -297,7 +297,7 @@ ReturnedValue ObjectPrototype::method_freeze(SimpleCallContext *ctx)
     return o.asReturnedValue();
 }
 
-ReturnedValue ObjectPrototype::method_preventExtensions(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_preventExtensions(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> o(scope, ctx->argument(0));
@@ -308,7 +308,7 @@ ReturnedValue ObjectPrototype::method_preventExtensions(SimpleCallContext *ctx)
     return o.asReturnedValue();
 }
 
-ReturnedValue ObjectPrototype::method_isSealed(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_isSealed(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> o(scope, ctx->argument(0));
@@ -336,7 +336,7 @@ ReturnedValue ObjectPrototype::method_isSealed(SimpleCallContext *ctx)
     return Encode(true);
 }
 
-ReturnedValue ObjectPrototype::method_isFrozen(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_isFrozen(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> o(scope, ctx->argument(0));
@@ -364,7 +364,7 @@ ReturnedValue ObjectPrototype::method_isFrozen(SimpleCallContext *ctx)
     return Encode(true);
 }
 
-ReturnedValue ObjectPrototype::method_isExtensible(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_isExtensible(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> o(scope, ctx->argument(0));
@@ -374,7 +374,7 @@ ReturnedValue ObjectPrototype::method_isExtensible(SimpleCallContext *ctx)
     return Encode((bool)o->extensible);
 }
 
-ReturnedValue ObjectPrototype::method_keys(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_keys(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> o(scope, ctx->argument(0));
@@ -395,7 +395,7 @@ ReturnedValue ObjectPrototype::method_keys(SimpleCallContext *ctx)
     return a.asReturnedValue();
 }
 
-ReturnedValue ObjectPrototype::method_toString(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_toString(CallContext *ctx)
 {
     Scope scope(ctx);
     if (ctx->callData->thisObject.isUndefined()) {
@@ -409,7 +409,7 @@ ReturnedValue ObjectPrototype::method_toString(SimpleCallContext *ctx)
     }
 }
 
-ReturnedValue ObjectPrototype::method_toLocaleString(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_toLocaleString(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject o(scope, ctx->callData->thisObject.toObject(ctx));
@@ -423,7 +423,7 @@ ReturnedValue ObjectPrototype::method_toLocaleString(SimpleCallContext *ctx)
     return f->call(callData);
 }
 
-ReturnedValue ObjectPrototype::method_valueOf(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_valueOf(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedValue v(scope, ctx->callData->thisObject.toObject(ctx));
@@ -432,7 +432,7 @@ ReturnedValue ObjectPrototype::method_valueOf(SimpleCallContext *ctx)
     return v.asReturnedValue();
 }
 
-ReturnedValue ObjectPrototype::method_hasOwnProperty(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_hasOwnProperty(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<String> P(scope, ctx->argument(0), Scoped<String>::Convert);
@@ -447,7 +447,7 @@ ReturnedValue ObjectPrototype::method_hasOwnProperty(SimpleCallContext *ctx)
     return Encode(r);
 }
 
-ReturnedValue ObjectPrototype::method_isPrototypeOf(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_isPrototypeOf(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> V(scope, ctx->argument(0));
@@ -466,7 +466,7 @@ ReturnedValue ObjectPrototype::method_isPrototypeOf(SimpleCallContext *ctx)
     return Encode(false);
 }
 
-ReturnedValue ObjectPrototype::method_propertyIsEnumerable(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_propertyIsEnumerable(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<String> p(scope, ctx->argument(0), Scoped<String>::Convert);
@@ -481,7 +481,7 @@ ReturnedValue ObjectPrototype::method_propertyIsEnumerable(SimpleCallContext *ct
     return Encode(attrs.isEnumerable());
 }
 
-ReturnedValue ObjectPrototype::method_defineGetter(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_defineGetter(CallContext *ctx)
 {
     if (ctx->callData->argc < 2)
         return ctx->throwTypeError();
@@ -507,7 +507,7 @@ ReturnedValue ObjectPrototype::method_defineGetter(SimpleCallContext *ctx)
     return Encode::undefined();
 }
 
-ReturnedValue ObjectPrototype::method_defineSetter(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_defineSetter(CallContext *ctx)
 {
     if (ctx->callData->argc < 2)
         return ctx->throwTypeError();
@@ -533,7 +533,7 @@ ReturnedValue ObjectPrototype::method_defineSetter(SimpleCallContext *ctx)
     return Encode::undefined();
 }
 
-ReturnedValue ObjectPrototype::method_get_proto(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_get_proto(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedObject o(scope, ctx->callData->thisObject.asObject());
@@ -543,7 +543,7 @@ ReturnedValue ObjectPrototype::method_get_proto(SimpleCallContext *ctx)
     return o->prototype()->asReturnedValue();
 }
 
-ReturnedValue ObjectPrototype::method_set_proto(SimpleCallContext *ctx)
+ReturnedValue ObjectPrototype::method_set_proto(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Object> o(scope, ctx->callData->thisObject);
diff --git a/src/qml/jsruntime/qv4objectproto_p.h b/src/qml/jsruntime/qv4objectproto_p.h
index b5dcd06032..0bd8072db8 100644
--- a/src/qml/jsruntime/qv4objectproto_p.h
+++ b/src/qml/jsruntime/qv4objectproto_p.h
@@ -64,32 +64,32 @@ struct ObjectPrototype: Object
 
     void init(ExecutionEngine *engine, ObjectRef ctor);
 
-    static ReturnedValue method_getPrototypeOf(SimpleCallContext *ctx);
-    static ReturnedValue method_getOwnPropertyDescriptor(SimpleCallContext *ctx);
-    static ReturnedValue method_getOwnPropertyNames(SimpleCallContext *context);
-    static ReturnedValue method_create(SimpleCallContext *ctx);
-    static ReturnedValue method_defineProperty(SimpleCallContext *ctx);
-    static ReturnedValue method_defineProperties(SimpleCallContext *ctx);
-    static ReturnedValue method_seal(SimpleCallContext *ctx);
-    static ReturnedValue method_freeze(SimpleCallContext *ctx);
-    static ReturnedValue method_preventExtensions(SimpleCallContext *ctx);
-    static ReturnedValue method_isSealed(SimpleCallContext *ctx);
-    static ReturnedValue method_isFrozen(SimpleCallContext *ctx);
-    static ReturnedValue method_isExtensible(SimpleCallContext *ctx);
-    static ReturnedValue method_keys(SimpleCallContext *ctx);
-
-    static ReturnedValue method_toString(SimpleCallContext *ctx);
-    static ReturnedValue method_toLocaleString(SimpleCallContext *ctx);
-    static ReturnedValue method_valueOf(SimpleCallContext *ctx);
-    static ReturnedValue method_hasOwnProperty(SimpleCallContext *ctx);
-    static ReturnedValue method_isPrototypeOf(SimpleCallContext *ctx);
-    static ReturnedValue method_propertyIsEnumerable(SimpleCallContext *ctx);
-
-    static ReturnedValue method_defineGetter(SimpleCallContext *ctx);
-    static ReturnedValue method_defineSetter(SimpleCallContext *ctx);
-
-    static ReturnedValue method_get_proto(SimpleCallContext *ctx);
-    static ReturnedValue method_set_proto(SimpleCallContext *ctx);
+    static ReturnedValue method_getPrototypeOf(CallContext *ctx);
+    static ReturnedValue method_getOwnPropertyDescriptor(CallContext *ctx);
+    static ReturnedValue method_getOwnPropertyNames(CallContext *context);
+    static ReturnedValue method_create(CallContext *ctx);
+    static ReturnedValue method_defineProperty(CallContext *ctx);
+    static ReturnedValue method_defineProperties(CallContext *ctx);
+    static ReturnedValue method_seal(CallContext *ctx);
+    static ReturnedValue method_freeze(CallContext *ctx);
+    static ReturnedValue method_preventExtensions(CallContext *ctx);
+    static ReturnedValue method_isSealed(CallContext *ctx);
+    static ReturnedValue method_isFrozen(CallContext *ctx);
+    static ReturnedValue method_isExtensible(CallContext *ctx);
+    static ReturnedValue method_keys(CallContext *ctx);
+
+    static ReturnedValue method_toString(CallContext *ctx);
+    static ReturnedValue method_toLocaleString(CallContext *ctx);
+    static ReturnedValue method_valueOf(CallContext *ctx);
+    static ReturnedValue method_hasOwnProperty(CallContext *ctx);
+    static ReturnedValue method_isPrototypeOf(CallContext *ctx);
+    static ReturnedValue method_propertyIsEnumerable(CallContext *ctx);
+
+    static ReturnedValue method_defineGetter(CallContext *ctx);
+    static ReturnedValue method_defineSetter(CallContext *ctx);
+
+    static ReturnedValue method_get_proto(CallContext *ctx);
+    static ReturnedValue method_set_proto(CallContext *ctx);
 
     static void toPropertyDescriptor(ExecutionContext *ctx, const ValueRef v, Property *desc, PropertyAttributes *attrs);
     static ReturnedValue fromPropertyDescriptor(ExecutionContext *ctx, const Property *desc, PropertyAttributes attrs);
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 4537b6c941..578c7310f2 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -833,7 +833,7 @@ struct QObjectSlotDispatcher : public QtPrivate::QSlotObjectBase
 
 } // namespace QV4
 
-ReturnedValue QObjectWrapper::method_connect(SimpleCallContext *ctx)
+ReturnedValue QObjectWrapper::method_connect(CallContext *ctx)
 {
     if (ctx->callData->argc == 0)
         V4THROW_ERROR("Function.prototype.connect: no arguments given");
@@ -879,7 +879,7 @@ ReturnedValue QObjectWrapper::method_connect(SimpleCallContext *ctx)
     return Encode::undefined();
 }
 
-ReturnedValue QObjectWrapper::method_disconnect(SimpleCallContext *ctx)
+ReturnedValue QObjectWrapper::method_disconnect(CallContext *ctx)
 {
     if (ctx->callData->argc == 0)
         V4THROW_ERROR("Function.prototype.disconnect: no arguments given");
diff --git a/src/qml/jsruntime/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h
index eb3cf15bff..f6c333f401 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper_p.h
+++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h
@@ -121,8 +121,8 @@ private:
         static_cast<QObjectWrapper *>(that)->~QObjectWrapper();
     }
 
-    static ReturnedValue method_connect(SimpleCallContext *ctx);
-    static ReturnedValue method_disconnect(SimpleCallContext *ctx);
+    static ReturnedValue method_connect(CallContext *ctx);
+    static ReturnedValue method_disconnect(CallContext *ctx);
 };
 
 struct QObjectMethod : public QV4::FunctionObject
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index c2d04cc7ed..a8597229c4 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -314,7 +314,7 @@ void RegExpPrototype::init(ExecutionEngine *engine, ObjectRef ctor)
     defineDefaultProperty(QStringLiteral("compile"), method_compile, 2);
 }
 
-ReturnedValue RegExpPrototype::method_exec(SimpleCallContext *ctx)
+ReturnedValue RegExpPrototype::method_exec(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<RegExpObject> r(scope, ctx->callData->thisObject.as<RegExpObject>());
@@ -361,14 +361,14 @@ ReturnedValue RegExpPrototype::method_exec(SimpleCallContext *ctx)
     return array.asReturnedValue();
 }
 
-ReturnedValue RegExpPrototype::method_test(SimpleCallContext *ctx)
+ReturnedValue RegExpPrototype::method_test(CallContext *ctx)
 {
     Scope scope(ctx);
     ScopedValue r(scope, method_exec(ctx));
     return Encode(!r->isNull());
 }
 
-ReturnedValue RegExpPrototype::method_toString(SimpleCallContext *ctx)
+ReturnedValue RegExpPrototype::method_toString(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<RegExpObject> r(scope, ctx->callData->thisObject.as<RegExpObject>());
@@ -378,7 +378,7 @@ ReturnedValue RegExpPrototype::method_toString(SimpleCallContext *ctx)
     return ctx->engine->newString(r->toString())->asReturnedValue();
 }
 
-ReturnedValue RegExpPrototype::method_compile(SimpleCallContext *ctx)
+ReturnedValue RegExpPrototype::method_compile(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<RegExpObject> r(scope, ctx->callData->thisObject.as<RegExpObject>());
diff --git a/src/qml/jsruntime/qv4regexpobject_p.h b/src/qml/jsruntime/qv4regexpobject_p.h
index 70bc9476e0..0129f8d396 100644
--- a/src/qml/jsruntime/qv4regexpobject_p.h
+++ b/src/qml/jsruntime/qv4regexpobject_p.h
@@ -115,10 +115,10 @@ struct RegExpPrototype: RegExpObject
     RegExpPrototype(InternalClass *ic): RegExpObject(ic) {}
     void init(ExecutionEngine *engine, ObjectRef ctor);
 
-    static ReturnedValue method_exec(SimpleCallContext *ctx);
-    static ReturnedValue method_test(SimpleCallContext *ctx);
-    static ReturnedValue method_toString(SimpleCallContext *ctx);
-    static ReturnedValue method_compile(SimpleCallContext *ctx);
+    static ReturnedValue method_exec(CallContext *ctx);
+    static ReturnedValue method_test(CallContext *ctx);
+    static ReturnedValue method_toString(CallContext *ctx);
+    static ReturnedValue method_compile(CallContext *ctx);
 };
 
 }
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h
index 094f5ce2bb..17a19b5201 100644
--- a/src/qml/jsruntime/qv4scopedvalue_p.h
+++ b/src/qml/jsruntime/qv4scopedvalue_p.h
@@ -741,7 +741,7 @@ inline WeakValue &WeakValue::operator=(Returned<T> *obj)
     return operator=(QV4::Value::fromManaged(obj->getPointer()).asReturnedValue());
 }
 
-inline ReturnedValue SimpleCallContext::argument(int i) {
+inline ReturnedValue CallContext::argument(int i) {
     return i < callData->argc ? callData->args[i].asReturnedValue() : Primitive::undefinedValue().asReturnedValue();
 }
 
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp
index 8d2a399b70..26e4dcb8a2 100644
--- a/src/qml/jsruntime/qv4sequenceobject.cpp
+++ b/src/qml/jsruntime/qv4sequenceobject.cpp
@@ -379,7 +379,7 @@ public:
         QV4::ValueRef m_compareFn;
     };
 
-    void sort(QV4::SimpleCallContext *ctx)
+    void sort(QV4::CallContext *ctx)
     {
         if (m_isReference) {
             if (!m_object)
@@ -400,7 +400,7 @@ public:
             storeReference();
     }
 
-    static QV4::ReturnedValue method_get_length(QV4::SimpleCallContext *ctx)
+    static QV4::ReturnedValue method_get_length(QV4::CallContext *ctx)
     {
         QV4::Scope scope(ctx);
         QV4::Scoped<QQmlSequence<Container> > This(scope, ctx->callData->thisObject.as<QQmlSequence<Container> >());
@@ -415,7 +415,7 @@ public:
         return QV4::Encode(This->m_container.count());
     }
 
-    static QV4::ReturnedValue method_set_length(QV4::SimpleCallContext* ctx)
+    static QV4::ReturnedValue method_set_length(QV4::CallContext* ctx)
     {
         QV4::Scope scope(ctx);
         QV4::Scoped<QQmlSequence<Container> > This(scope, ctx->callData->thisObject.as<QQmlSequence<Container> >());
@@ -553,7 +553,7 @@ void SequencePrototype::init()
     defineDefaultProperty(engine()->id_valueOf, method_valueOf, 0);
 }
 
-QV4::ReturnedValue SequencePrototype::method_sort(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue SequencePrototype::method_sort(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::ScopedObject o(scope, ctx->callData->thisObject);
diff --git a/src/qml/jsruntime/qv4sequenceobject_p.h b/src/qml/jsruntime/qv4sequenceobject_p.h
index 3bbb86f231..54a96863df 100644
--- a/src/qml/jsruntime/qv4sequenceobject_p.h
+++ b/src/qml/jsruntime/qv4sequenceobject_p.h
@@ -69,12 +69,12 @@ struct SequencePrototype : public QV4::Object
 
     void init();
 
-    static ReturnedValue method_valueOf(QV4::SimpleCallContext *ctx)
+    static ReturnedValue method_valueOf(QV4::CallContext *ctx)
     {
         return ctx->callData->thisObject.toString(ctx)->asReturnedValue();
     }
 
-    static ReturnedValue method_sort(QV4::SimpleCallContext *ctx);
+    static ReturnedValue method_sort(QV4::CallContext *ctx);
 
     static bool isSequenceType(int sequenceTypeId);
     static ReturnedValue newSequence(QV4::ExecutionEngine *engine, int sequenceTypeId, QObject *object, int propertyIndex, bool *succeeded);
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index 7ba7a38cc0..bff8f1f9cd 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -246,7 +246,7 @@ static QString getThisString(ExecutionContext *ctx)
     return t->toQString();
 }
 
-ReturnedValue StringPrototype::method_toString(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_toString(CallContext *context)
 {
     if (context->callData->thisObject.isString())
         return context->callData->thisObject.asReturnedValue();
@@ -257,7 +257,7 @@ ReturnedValue StringPrototype::method_toString(SimpleCallContext *context)
     return o->value.asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_charAt(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_charAt(CallContext *context)
 {
     const QString str = getThisString(context);
     if (context->engine->hasException)
@@ -274,7 +274,7 @@ ReturnedValue StringPrototype::method_charAt(SimpleCallContext *context)
     return context->engine->newString(result)->asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_charCodeAt(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_charCodeAt(CallContext *context)
 {
     const QString str = getThisString(context);
     if (context->engine->hasException)
@@ -291,7 +291,7 @@ ReturnedValue StringPrototype::method_charCodeAt(SimpleCallContext *context)
     return Encode(qSNaN());
 }
 
-ReturnedValue StringPrototype::method_concat(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_concat(CallContext *context)
 {
     Scope scope(context);
 
@@ -311,7 +311,7 @@ ReturnedValue StringPrototype::method_concat(SimpleCallContext *context)
     return context->engine->newString(value)->asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_indexOf(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_indexOf(CallContext *context)
 {
     QString value = getThisString(context);
     if (context->engine->hasException)
@@ -332,7 +332,7 @@ ReturnedValue StringPrototype::method_indexOf(SimpleCallContext *context)
     return Encode(index);
 }
 
-ReturnedValue StringPrototype::method_lastIndexOf(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_lastIndexOf(CallContext *context)
 {
     Scope scope(context);
 
@@ -360,7 +360,7 @@ ReturnedValue StringPrototype::method_lastIndexOf(SimpleCallContext *context)
     return Encode(index);
 }
 
-ReturnedValue StringPrototype::method_localeCompare(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_localeCompare(CallContext *context)
 {
     Scope scope(context);
     const QString value = getThisString(context);
@@ -372,7 +372,7 @@ ReturnedValue StringPrototype::method_localeCompare(SimpleCallContext *context)
     return Encode(QString::localeAwareCompare(value, that));
 }
 
-ReturnedValue StringPrototype::method_match(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_match(CallContext *context)
 {
     if (context->callData->thisObject.isUndefined() || context->callData->thisObject.isNull())
         return context->throwTypeError();
@@ -482,7 +482,7 @@ static void appendReplacementString(QString *result, const QString &input, const
     }
 }
 
-ReturnedValue StringPrototype::method_replace(SimpleCallContext *ctx)
+ReturnedValue StringPrototype::method_replace(CallContext *ctx)
 {
     Scope scope(ctx);
     QString string;
@@ -595,7 +595,7 @@ ReturnedValue StringPrototype::method_replace(SimpleCallContext *ctx)
     return ctx->engine->newString(result)->asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_search(SimpleCallContext *ctx)
+ReturnedValue StringPrototype::method_search(CallContext *ctx)
 {
     Scope scope(ctx);
     QString string = getThisString(ctx);
@@ -619,7 +619,7 @@ ReturnedValue StringPrototype::method_search(SimpleCallContext *ctx)
     return Encode(result);
 }
 
-ReturnedValue StringPrototype::method_slice(SimpleCallContext *ctx)
+ReturnedValue StringPrototype::method_slice(CallContext *ctx)
 {
     const QString text = getThisString(ctx);
     if (ctx->engine->hasException)
@@ -648,7 +648,7 @@ ReturnedValue StringPrototype::method_slice(SimpleCallContext *ctx)
     return ctx->engine->newString(text.mid(intStart, count))->asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_split(SimpleCallContext *ctx)
+ReturnedValue StringPrototype::method_split(CallContext *ctx)
 {
     Scope scope(ctx);
     QString text = getThisString(ctx);
@@ -729,7 +729,7 @@ ReturnedValue StringPrototype::method_split(SimpleCallContext *ctx)
     return array.asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_substr(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_substr(CallContext *context)
 {
     const QString value = getThisString(context);
     if (context->engine->hasException)
@@ -754,7 +754,7 @@ ReturnedValue StringPrototype::method_substr(SimpleCallContext *context)
     return context->engine->newString(value.mid(x, y))->asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_substring(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_substring(CallContext *context)
 {
     QString value = getThisString(context);
     if (context->engine->hasException)
@@ -795,7 +795,7 @@ ReturnedValue StringPrototype::method_substring(SimpleCallContext *context)
     return context->engine->newString(value.mid(x, y))->asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_toLowerCase(SimpleCallContext *ctx)
+ReturnedValue StringPrototype::method_toLowerCase(CallContext *ctx)
 {
     QString value = getThisString(ctx);
     if (ctx->engine->hasException)
@@ -803,12 +803,12 @@ ReturnedValue StringPrototype::method_toLowerCase(SimpleCallContext *ctx)
     return ctx->engine->newString(value.toLower())->asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_toLocaleLowerCase(SimpleCallContext *ctx)
+ReturnedValue StringPrototype::method_toLocaleLowerCase(CallContext *ctx)
 {
     return method_toLowerCase(ctx);
 }
 
-ReturnedValue StringPrototype::method_toUpperCase(SimpleCallContext *ctx)
+ReturnedValue StringPrototype::method_toUpperCase(CallContext *ctx)
 {
     QString value = getThisString(ctx);
     if (ctx->engine->hasException)
@@ -816,12 +816,12 @@ ReturnedValue StringPrototype::method_toUpperCase(SimpleCallContext *ctx)
     return ctx->engine->newString(value.toUpper())->asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_toLocaleUpperCase(SimpleCallContext *ctx)
+ReturnedValue StringPrototype::method_toLocaleUpperCase(CallContext *ctx)
 {
     return method_toUpperCase(ctx);
 }
 
-ReturnedValue StringPrototype::method_fromCharCode(SimpleCallContext *context)
+ReturnedValue StringPrototype::method_fromCharCode(CallContext *context)
 {
     QString str(context->callData->argc, Qt::Uninitialized);
     QChar *ch = str.data();
@@ -832,7 +832,7 @@ ReturnedValue StringPrototype::method_fromCharCode(SimpleCallContext *context)
     return context->engine->newString(str)->asReturnedValue();
 }
 
-ReturnedValue StringPrototype::method_trim(SimpleCallContext *ctx)
+ReturnedValue StringPrototype::method_trim(CallContext *ctx)
 {
     QString s = getThisString(ctx);
     if (ctx->engine->hasException)
diff --git a/src/qml/jsruntime/qv4stringobject_p.h b/src/qml/jsruntime/qv4stringobject_p.h
index c67f933479..e8e46b85e7 100644
--- a/src/qml/jsruntime/qv4stringobject_p.h
+++ b/src/qml/jsruntime/qv4stringobject_p.h
@@ -80,26 +80,26 @@ struct StringPrototype: StringObject
     StringPrototype(InternalClass *ic): StringObject(ic) {}
     void init(ExecutionEngine *engine, ObjectRef ctor);
 
-    static ReturnedValue method_toString(SimpleCallContext *context);
-    static ReturnedValue method_charAt(SimpleCallContext *context);
-    static ReturnedValue method_charCodeAt(SimpleCallContext *context);
-    static ReturnedValue method_concat(SimpleCallContext *context);
-    static ReturnedValue method_indexOf(SimpleCallContext *context);
-    static ReturnedValue method_lastIndexOf(SimpleCallContext *context);
-    static ReturnedValue method_localeCompare(SimpleCallContext *context);
-    static ReturnedValue method_match(SimpleCallContext *context);
-    static ReturnedValue method_replace(SimpleCallContext *ctx);
-    static ReturnedValue method_search(SimpleCallContext *ctx);
-    static ReturnedValue method_slice(SimpleCallContext *ctx);
-    static ReturnedValue method_split(SimpleCallContext *ctx);
-    static ReturnedValue method_substr(SimpleCallContext *context);
-    static ReturnedValue method_substring(SimpleCallContext *context);
-    static ReturnedValue method_toLowerCase(SimpleCallContext *ctx);
-    static ReturnedValue method_toLocaleLowerCase(SimpleCallContext *ctx);
-    static ReturnedValue method_toUpperCase(SimpleCallContext *ctx);
-    static ReturnedValue method_toLocaleUpperCase(SimpleCallContext *ctx);
-    static ReturnedValue method_fromCharCode(SimpleCallContext *context);
-    static ReturnedValue method_trim(SimpleCallContext *ctx);
+    static ReturnedValue method_toString(CallContext *context);
+    static ReturnedValue method_charAt(CallContext *context);
+    static ReturnedValue method_charCodeAt(CallContext *context);
+    static ReturnedValue method_concat(CallContext *context);
+    static ReturnedValue method_indexOf(CallContext *context);
+    static ReturnedValue method_lastIndexOf(CallContext *context);
+    static ReturnedValue method_localeCompare(CallContext *context);
+    static ReturnedValue method_match(CallContext *context);
+    static ReturnedValue method_replace(CallContext *ctx);
+    static ReturnedValue method_search(CallContext *ctx);
+    static ReturnedValue method_slice(CallContext *ctx);
+    static ReturnedValue method_split(CallContext *ctx);
+    static ReturnedValue method_substr(CallContext *context);
+    static ReturnedValue method_substring(CallContext *context);
+    static ReturnedValue method_toLowerCase(CallContext *ctx);
+    static ReturnedValue method_toLocaleLowerCase(CallContext *ctx);
+    static ReturnedValue method_toUpperCase(CallContext *ctx);
+    static ReturnedValue method_toLocaleUpperCase(CallContext *ctx);
+    static ReturnedValue method_fromCharCode(CallContext *context);
+    static ReturnedValue method_trim(CallContext *ctx);
 };
 
 }
diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp
index a37da31782..470e8e206b 100644
--- a/src/qml/jsruntime/qv4variantobject.cpp
+++ b/src/qml/jsruntime/qv4variantobject.cpp
@@ -153,7 +153,7 @@ void VariantPrototype::init()
     defineDefaultProperty(engine()->id_toString, method_toString, 0);
 }
 
-QV4::ReturnedValue VariantPrototype::method_preserve(SimpleCallContext *ctx)
+QV4::ReturnedValue VariantPrototype::method_preserve(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<VariantObject> o(scope, ctx->callData->thisObject.as<QV4::VariantObject>());
@@ -162,7 +162,7 @@ QV4::ReturnedValue VariantPrototype::method_preserve(SimpleCallContext *ctx)
     return Encode::undefined();
 }
 
-QV4::ReturnedValue VariantPrototype::method_destroy(SimpleCallContext *ctx)
+QV4::ReturnedValue VariantPrototype::method_destroy(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<VariantObject> o(scope, ctx->callData->thisObject.as<QV4::VariantObject>());
@@ -174,7 +174,7 @@ QV4::ReturnedValue VariantPrototype::method_destroy(SimpleCallContext *ctx)
     return Encode::undefined();
 }
 
-QV4::ReturnedValue VariantPrototype::method_toString(SimpleCallContext *ctx)
+QV4::ReturnedValue VariantPrototype::method_toString(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<VariantObject> o(scope, ctx->callData->thisObject.as<QV4::VariantObject>());
@@ -186,7 +186,7 @@ QV4::ReturnedValue VariantPrototype::method_toString(SimpleCallContext *ctx)
     return Encode(ctx->engine->newString(result));
 }
 
-QV4::ReturnedValue VariantPrototype::method_valueOf(SimpleCallContext *ctx)
+QV4::ReturnedValue VariantPrototype::method_valueOf(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<VariantObject> o(scope, ctx->callData->thisObject.as<QV4::VariantObject>());
diff --git a/src/qml/jsruntime/qv4variantobject_p.h b/src/qml/jsruntime/qv4variantobject_p.h
index 4d852142aa..4e14839184 100644
--- a/src/qml/jsruntime/qv4variantobject_p.h
+++ b/src/qml/jsruntime/qv4variantobject_p.h
@@ -89,10 +89,10 @@ public:
 
     void init();
 
-    static ReturnedValue method_preserve(SimpleCallContext *ctx);
-    static ReturnedValue method_destroy(SimpleCallContext *ctx);
-    static ReturnedValue method_toString(SimpleCallContext *ctx);
-    static ReturnedValue method_valueOf(SimpleCallContext *ctx);
+    static ReturnedValue method_preserve(CallContext *ctx);
+    static ReturnedValue method_destroy(CallContext *ctx);
+    static ReturnedValue method_toString(CallContext *ctx);
+    static ReturnedValue method_valueOf(CallContext *ctx);
 };
 
 }
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index 74a42b6f2f..3121f178a0 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -215,7 +215,7 @@ QV4::ReturnedValue VME::run(QV4::ExecutionContext *context, const uchar *code,
         QV4::ExecutionContext *scope = context;
         int i = 0;
         while (scope) {
-            if (scope->type >= QV4::ExecutionContext::Type_CallContext) {
+            if (scope->type >= QV4::ExecutionContext::Type_SimpleCallContext) {
                 QV4::CallContext *cc = static_cast<QV4::CallContext *>(scope);
                 scopes[2*i + 2] = cc->callData->args;
                 scopes[2*i + 3] = cc->locals;
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index ea88acd85f..2973944215 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1113,11 +1113,11 @@ class QmlIncubatorObject : public QV4::Object
 public:
     QmlIncubatorObject(QV8Engine *engine, QQmlIncubator::IncubationMode = QQmlIncubator::Asynchronous);
 
-    static QV4::ReturnedValue method_get_statusChanged(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_statusChanged(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_status(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_object(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_forceCompletion(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_get_statusChanged(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_statusChanged(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_status(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_object(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_forceCompletion(QV4::CallContext *ctx);
 
     static void destroy(Managed *that);
     static void markObjects(Managed *that, QV4::ExecutionEngine *e);
@@ -1444,7 +1444,7 @@ QQmlComponentExtension::QQmlComponentExtension(QV8Engine *engine)
     incubationProto = proto;
 }
 
-QV4::ReturnedValue QmlIncubatorObject::method_get_object(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QmlIncubatorObject::method_get_object(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QmlIncubatorObject> o(scope, ctx->callData->thisObject.as<QmlIncubatorObject>());
@@ -1454,7 +1454,7 @@ QV4::ReturnedValue QmlIncubatorObject::method_get_object(QV4::SimpleCallContext
     return QV4::QObjectWrapper::wrap(ctx->engine, o->incubator->object());
 }
 
-QV4::ReturnedValue QmlIncubatorObject::method_forceCompletion(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QmlIncubatorObject::method_forceCompletion(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QmlIncubatorObject> o(scope, ctx->callData->thisObject.as<QmlIncubatorObject>());
@@ -1466,7 +1466,7 @@ QV4::ReturnedValue QmlIncubatorObject::method_forceCompletion(QV4::SimpleCallCon
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue QmlIncubatorObject::method_get_status(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QmlIncubatorObject::method_get_status(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QmlIncubatorObject> o(scope, ctx->callData->thisObject.as<QmlIncubatorObject>());
@@ -1476,7 +1476,7 @@ QV4::ReturnedValue QmlIncubatorObject::method_get_status(QV4::SimpleCallContext
     return QV4::Encode(o->incubator->status());
 }
 
-QV4::ReturnedValue QmlIncubatorObject::method_get_statusChanged(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QmlIncubatorObject::method_get_statusChanged(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QmlIncubatorObject> o(scope, ctx->callData->thisObject.as<QmlIncubatorObject>());
@@ -1486,7 +1486,7 @@ QV4::ReturnedValue QmlIncubatorObject::method_get_statusChanged(QV4::SimpleCallC
     return o->m_statusChanged.asReturnedValue();
 }
 
-QV4::ReturnedValue QmlIncubatorObject::method_set_statusChanged(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QmlIncubatorObject::method_set_statusChanged(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QmlIncubatorObject> o(scope, ctx->callData->thisObject.as<QmlIncubatorObject>());
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index b92b3e4c2c..5e8130f407 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -67,7 +67,7 @@ public:
 
     QLocale locale;
 
-    static QLocale *getThisLocale(QV4::SimpleCallContext *ctx) {
+    static QLocale *getThisLocale(QV4::CallContext *ctx) {
         QQmlLocaleData *thisObject = ctx->callData->thisObject.asObject()->as<QQmlLocaleData>();
         if (!thisObject) {
             ctx->throwTypeError();
@@ -76,33 +76,33 @@ public:
         return &thisObject->locale;
     }
 
-    static QV4::ReturnedValue method_currencySymbol(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_dateTimeFormat(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_timeFormat(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_dateFormat(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_monthName(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_standaloneMonthName(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_dayName(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_standaloneDayName(QV4::SimpleCallContext *ctx);
-
-    static QV4::ReturnedValue method_get_firstDayOfWeek(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_measurementSystem(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_textDirection(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_weekDays(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_uiLanguages(QV4::SimpleCallContext *ctx);
-
-    static QV4::ReturnedValue method_get_name(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_nativeLanguageName(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_nativeCountryName(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_decimalPoint(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_groupSeparator(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_percent(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_zeroDigit(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_negativeSign(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_positiveSign(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_exponential(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_amText(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_pmText(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_currencySymbol(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_dateTimeFormat(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_timeFormat(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_dateFormat(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_monthName(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_standaloneMonthName(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_dayName(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_standaloneDayName(QV4::CallContext *ctx);
+
+    static QV4::ReturnedValue method_get_firstDayOfWeek(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_measurementSystem(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_textDirection(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_weekDays(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_uiLanguages(QV4::CallContext *ctx);
+
+    static QV4::ReturnedValue method_get_name(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_nativeLanguageName(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_nativeCountryName(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_decimalPoint(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_groupSeparator(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_percent(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_zeroDigit(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_negativeSign(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_positiveSign(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_exponential(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_amText(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_pmText(QV4::CallContext *ctx);
 
 private:
     static void destroy(Managed *that)
@@ -137,7 +137,7 @@ void QQmlDateExtension::registerExtension(QV4::ExecutionEngine *engine)
     engine->dateCtor.objectValue()->defineDefaultProperty(QStringLiteral("timeZoneUpdated"), method_timeZoneUpdated);
 }
 
-QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc > 2)
         return QV4::DatePrototype::method_toLocaleString(ctx);
@@ -181,7 +181,7 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::SimpleCallConte
     return ctx->engine->newString(formattedDt)->asReturnedValue();
 }
 
-QV4::ReturnedValue QQmlDateExtension::method_toLocaleTimeString(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlDateExtension::method_toLocaleTimeString(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc > 2)
         return QV4::DatePrototype::method_toLocaleTimeString(ctx);
@@ -226,7 +226,7 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleTimeString(QV4::SimpleCallC
     return ctx->engine->newString(formattedTime)->asReturnedValue();
 }
 
-QV4::ReturnedValue QQmlDateExtension::method_toLocaleDateString(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlDateExtension::method_toLocaleDateString(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc > 2)
         return QV4::DatePrototype::method_toLocaleDateString(ctx);
@@ -271,7 +271,7 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleDateString(QV4::SimpleCallC
     return ctx->engine->newString(formattedDate)->asReturnedValue();
 }
 
-QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine * const engine = ctx->engine;
     if (ctx->callData->argc == 1 && ctx->callData->args[0].isString()) {
@@ -309,7 +309,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::SimpleCallCon
     return QV4::Encode(engine->newDateObject(dt));
 }
 
-QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine * const engine = ctx->engine;
 
@@ -353,7 +353,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::SimpleCal
     return QV4::Encode(engine->newDateObject(dt));
 }
 
-QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine * const engine = ctx->engine;
 
@@ -392,7 +392,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::SimpleCal
     return QV4::Encode(engine->newDateObject(QDateTime(dt)));
 }
 
-QV4::ReturnedValue QQmlDateExtension::method_timeZoneUpdated(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlDateExtension::method_timeZoneUpdated(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 0)
         V4THROW_ERROR("Locale: Date.timeZoneUpdated(): Invalid arguments");
@@ -412,7 +412,7 @@ void QQmlNumberExtension::registerExtension(QV4::ExecutionEngine *engine)
     engine->numberCtor.objectValue()->defineDefaultProperty(QStringLiteral("fromLocaleString"), method_fromLocaleString);
 }
 
-QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc > 3)
         V4THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments");
@@ -450,7 +450,7 @@ QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(QV4::SimpleCallCon
     return ctx->engine->newString(r->locale.toString(number, (char)format, prec))->asReturnedValue();
 }
 
-QV4::ReturnedValue QQmlNumberExtension::method_toLocaleCurrencyString(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlNumberExtension::method_toLocaleCurrencyString(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc > 2)
         V4THROW_ERROR("Locale: Number.toLocaleCurrencyString(): Invalid arguments");
@@ -480,7 +480,7 @@ QV4::ReturnedValue QQmlNumberExtension::method_toLocaleCurrencyString(QV4::Simpl
     return ctx->engine->newString(r->locale.toCurrencyString(number, symbol))->asReturnedValue();
 }
 
-QV4::ReturnedValue QQmlNumberExtension::method_fromLocaleString(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlNumberExtension::method_fromLocaleString(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc < 1 || ctx->callData->argc > 2)
         V4THROW_ERROR("Locale: Number.fromLocaleString(): Invalid arguments");
@@ -516,7 +516,7 @@ QV4::ReturnedValue QQmlNumberExtension::method_fromLocaleString(QV4::SimpleCallC
 //--------------
 // Locale object
 
-QV4::ReturnedValue QQmlLocaleData::method_get_firstDayOfWeek(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlLocaleData::method_get_firstDayOfWeek(QV4::CallContext *ctx)
 {
     QLocale *locale = getThisLocale(ctx);
     if (!locale)
@@ -527,7 +527,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_firstDayOfWeek(QV4::SimpleCallCont
     return QV4::Encode(fdow);
 }
 
-QV4::ReturnedValue QQmlLocaleData::method_get_measurementSystem(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlLocaleData::method_get_measurementSystem(QV4::CallContext *ctx)
 {
     QLocale *locale = getThisLocale(ctx);
     if (!locale)
@@ -535,7 +535,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_measurementSystem(QV4::SimpleCallC
     return QV4::Encode(locale->measurementSystem());
 }
 
-QV4::ReturnedValue QQmlLocaleData::method_get_textDirection(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlLocaleData::method_get_textDirection(QV4::CallContext *ctx)
 {
     QLocale *locale = getThisLocale(ctx);
     if (!locale)
@@ -544,7 +544,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_textDirection(QV4::SimpleCallConte
     return QV4::Encode(locale->textDirection());
 }
 
-QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QLocale *locale = getThisLocale(ctx);
@@ -567,7 +567,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::SimpleCallContext *c
     return result.asReturnedValue();
 }
 
-QV4::ReturnedValue QQmlLocaleData::method_get_uiLanguages(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlLocaleData::method_get_uiLanguages(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QLocale *locale = getThisLocale(ctx);
@@ -587,7 +587,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_uiLanguages(QV4::SimpleCallContext
     return result.asReturnedValue();
 }
 
-QV4::ReturnedValue QQmlLocaleData::method_currencySymbol(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlLocaleData::method_currencySymbol(QV4::CallContext *ctx)
 {
     QLocale *locale = getThisLocale(ctx);
     if (!locale)
@@ -606,7 +606,7 @@ QV4::ReturnedValue QQmlLocaleData::method_currencySymbol(QV4::SimpleCallContext
 }
 
 #define LOCALE_FORMAT(FUNC) \
-QV4::ReturnedValue QQmlLocaleData::method_ ##FUNC (QV4::SimpleCallContext *ctx) { \
+QV4::ReturnedValue QQmlLocaleData::method_ ##FUNC (QV4::CallContext *ctx) { \
     QLocale *locale = getThisLocale(ctx); \
     if (!locale) \
         return QV4::Encode::undefined(); \
@@ -626,7 +626,7 @@ LOCALE_FORMAT(dateFormat)
 
 // +1 added to idx because JS is 0-based, whereas QLocale months begin at 1.
 #define LOCALE_FORMATTED_MONTHNAME(VARIABLE) \
-QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::SimpleCallContext *ctx) {\
+QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::CallContext *ctx) {\
     QLocale *locale = getThisLocale(ctx); \
     if (!locale) \
         return QV4::Encode::undefined(); \
@@ -653,7 +653,7 @@ QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::SimpleCallContext *
 
 // 0 -> 7 as Qt::Sunday is 7, but Sunday is 0 in JS Date
 #define LOCALE_FORMATTED_DAYNAME(VARIABLE) \
-QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::SimpleCallContext *ctx) {\
+QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::CallContext *ctx) {\
     QLocale *locale = getThisLocale(ctx); \
     if (!locale) \
         return QV4::Encode::undefined(); \
@@ -684,7 +684,7 @@ LOCALE_FORMATTED_MONTHNAME(standaloneMonthName)
 LOCALE_FORMATTED_DAYNAME(dayName)
 LOCALE_FORMATTED_DAYNAME(standaloneDayName)
 
-#define LOCALE_STRING_PROPERTY(VARIABLE) QV4::ReturnedValue QQmlLocaleData::method_get_ ## VARIABLE (QV4::SimpleCallContext* ctx) \
+#define LOCALE_STRING_PROPERTY(VARIABLE) QV4::ReturnedValue QQmlLocaleData::method_get_ ## VARIABLE (QV4::CallContext* ctx) \
 { \
     QLocale *locale = getThisLocale(ctx); \
     if (!locale) \
@@ -875,7 +875,7 @@ void QQmlLocale::registerStringLocaleCompare(QV4::ExecutionEngine *engine)
     engine->stringClass->prototype->defineDefaultProperty(QStringLiteral("localeCompare"), method_localeCompare);
 }
 
-QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 1 || (!ctx->callData->args[0].isString() && !ctx->callData->args[0].asStringObject()))
         return QV4::StringPrototype::method_localeCompare(ctx);
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h
index 8075bd462f..8ca67a8c83 100644
--- a/src/qml/qml/qqmllocale_p.h
+++ b/src/qml/qml/qqmllocale_p.h
@@ -58,13 +58,13 @@ public:
     static void registerExtension(QV4::ExecutionEngine *engine);
 
 private:
-    static QV4::ReturnedValue method_toLocaleString(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_toLocaleTimeString(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_toLocaleDateString(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_fromLocaleString(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_fromLocaleTimeString(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_fromLocaleDateString(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_timeZoneUpdated(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_toLocaleString(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_toLocaleTimeString(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_toLocaleDateString(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_fromLocaleString(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_fromLocaleTimeString(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_fromLocaleDateString(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_timeZoneUpdated(QV4::CallContext *ctx);
 };
 
 
@@ -74,9 +74,9 @@ public:
     static void registerExtension(QV4::ExecutionEngine *engine);
 
 private:
-    static QV4::ReturnedValue method_toLocaleString(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_fromLocaleString(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_toLocaleCurrencyString(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_toLocaleString(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_fromLocaleString(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_toLocaleCurrencyString(QV4::CallContext *ctx);
 };
 
 
@@ -125,7 +125,7 @@ public:
 private:
     QQmlLocale();
 
-    static QV4::ReturnedValue method_localeCompare(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_localeCompare(QV4::CallContext *ctx);
 };
 
 
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index d6f35f1737..d733694923 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -244,7 +244,7 @@ bool QmlValueTypeWrapper::isEqual(const QVariant& value)
     }
 }
 
-ReturnedValue QmlValueTypeWrapper::method_toString(SimpleCallContext *ctx)
+ReturnedValue QmlValueTypeWrapper::method_toString(CallContext *ctx)
 {
     Object *o = ctx->callData->thisObject.asObject();
     if (!o)
diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h
index f2effc362b..9dd3e8dcbe 100644
--- a/src/qml/qml/qqmlvaluetypewrapper_p.h
+++ b/src/qml/qml/qqmlvaluetypewrapper_p.h
@@ -89,7 +89,7 @@ public:
     static bool isEqualTo(Managed *m, Managed *other);
     static PropertyAttributes query(const Managed *, StringRef name);
 
-    static QV4::ReturnedValue method_toString(SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_toString(CallContext *ctx);
 
     QV8Engine *v8;
     ObjectType objectType;
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index ccbc28e9f2..18e3e33c4b 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -279,24 +279,24 @@ public:
     static void initClass(ExecutionEngine *engine);
 
     // JS API
-    static ReturnedValue method_get_nodeName(SimpleCallContext *ctx);
-    static ReturnedValue method_get_nodeValue(SimpleCallContext *ctx);
-    static ReturnedValue method_get_nodeType(SimpleCallContext *ctx);
-
-    static ReturnedValue method_get_parentNode(SimpleCallContext *ctx);
-    static ReturnedValue method_get_childNodes(SimpleCallContext *ctx);
-    static ReturnedValue method_get_firstChild(SimpleCallContext *ctx);
-    static ReturnedValue method_get_lastChild(SimpleCallContext *ctx);
-    static ReturnedValue method_get_previousSibling(SimpleCallContext *ctx);
-    static ReturnedValue method_get_nextSibling(SimpleCallContext *ctx);
-    static ReturnedValue method_get_attributes(SimpleCallContext *ctx);
-
-    //static ReturnedValue ownerDocument(SimpleCallContext *ctx);
-    //static ReturnedValue namespaceURI(SimpleCallContext *ctx);
-    //static ReturnedValue prefix(SimpleCallContext *ctx);
-    //static ReturnedValue localName(SimpleCallContext *ctx);
-    //static ReturnedValue baseURI(SimpleCallContext *ctx);
-    //static ReturnedValue textContent(SimpleCallContext *ctx);
+    static ReturnedValue method_get_nodeName(CallContext *ctx);
+    static ReturnedValue method_get_nodeValue(CallContext *ctx);
+    static ReturnedValue method_get_nodeType(CallContext *ctx);
+
+    static ReturnedValue method_get_parentNode(CallContext *ctx);
+    static ReturnedValue method_get_childNodes(CallContext *ctx);
+    static ReturnedValue method_get_firstChild(CallContext *ctx);
+    static ReturnedValue method_get_lastChild(CallContext *ctx);
+    static ReturnedValue method_get_previousSibling(CallContext *ctx);
+    static ReturnedValue method_get_nextSibling(CallContext *ctx);
+    static ReturnedValue method_get_attributes(CallContext *ctx);
+
+    //static ReturnedValue ownerDocument(CallContext *ctx);
+    //static ReturnedValue namespaceURI(CallContext *ctx);
+    //static ReturnedValue prefix(CallContext *ctx);
+    //static ReturnedValue localName(CallContext *ctx);
+    //static ReturnedValue baseURI(CallContext *ctx);
+    //static ReturnedValue textContent(CallContext *ctx);
 
     static ReturnedValue getProto(ExecutionEngine *v4);
 
@@ -352,12 +352,12 @@ class Attr : public Node
 {
 public:
     // JS API
-    static ReturnedValue method_name(SimpleCallContext *ctx);
-//    static ReturnedValue specified(SimpleCallContext *);
-    static ReturnedValue method_value(SimpleCallContext *ctx);
-    static ReturnedValue method_ownerElement(SimpleCallContext *ctx);
-//    static ReturnedValue schemaTypeInfo(SimpleCallContext *);
-//    static ReturnedValue isId(SimpleCallContext *c);
+    static ReturnedValue method_name(CallContext *ctx);
+//    static ReturnedValue specified(CallContext *);
+    static ReturnedValue method_value(CallContext *ctx);
+    static ReturnedValue method_ownerElement(CallContext *ctx);
+//    static ReturnedValue schemaTypeInfo(CallContext *);
+//    static ReturnedValue isId(CallContext *c);
 
     // C++ API
     static ReturnedValue prototype(ExecutionEngine *);
@@ -367,7 +367,7 @@ class CharacterData : public Node
 {
 public:
     // JS API
-    static ReturnedValue method_length(SimpleCallContext *ctx);
+    static ReturnedValue method_length(CallContext *ctx);
 
     // C++ API
     static ReturnedValue prototype(ExecutionEngine *v4);
@@ -377,8 +377,8 @@ class Text : public CharacterData
 {
 public:
     // JS API
-    static ReturnedValue method_isElementContentWhitespace(SimpleCallContext *ctx);
-    static ReturnedValue method_wholeText(SimpleCallContext *ctx);
+    static ReturnedValue method_isElementContentWhitespace(CallContext *ctx);
+    static ReturnedValue method_wholeText(CallContext *ctx);
 
     // C++ API
     static ReturnedValue prototype(ExecutionEngine *);
@@ -395,10 +395,10 @@ class Document : public Node
 {
 public:
     // JS API
-    static ReturnedValue method_xmlVersion(SimpleCallContext *ctx);
-    static ReturnedValue method_xmlEncoding(SimpleCallContext *ctx);
-    static ReturnedValue method_xmlStandalone(SimpleCallContext *ctx);
-    static ReturnedValue method_documentElement(SimpleCallContext *ctx);
+    static ReturnedValue method_xmlVersion(CallContext *ctx);
+    static ReturnedValue method_xmlEncoding(CallContext *ctx);
+    static ReturnedValue method_xmlStandalone(CallContext *ctx);
+    static ReturnedValue method_documentElement(CallContext *ctx);
 
     // C++ API
     static ReturnedValue prototype(ExecutionEngine *);
@@ -417,7 +417,7 @@ void NodeImpl::release()
     document->release();
 }
 
-ReturnedValue NodePrototype::method_get_nodeName(SimpleCallContext *ctx)
+ReturnedValue NodePrototype::method_get_nodeName(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -442,7 +442,7 @@ ReturnedValue NodePrototype::method_get_nodeName(SimpleCallContext *ctx)
     return Encode(ctx->engine->newString(name));
 }
 
-ReturnedValue NodePrototype::method_get_nodeValue(SimpleCallContext *ctx)
+ReturnedValue NodePrototype::method_get_nodeValue(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -461,7 +461,7 @@ ReturnedValue NodePrototype::method_get_nodeValue(SimpleCallContext *ctx)
     return Encode(ctx->engine->newString(r->d->data));
 }
 
-ReturnedValue NodePrototype::method_get_nodeType(SimpleCallContext *ctx)
+ReturnedValue NodePrototype::method_get_nodeType(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -471,7 +471,7 @@ ReturnedValue NodePrototype::method_get_nodeType(SimpleCallContext *ctx)
     return Encode(r->d->type);
 }
 
-ReturnedValue NodePrototype::method_get_parentNode(SimpleCallContext *ctx)
+ReturnedValue NodePrototype::method_get_parentNode(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -486,7 +486,7 @@ ReturnedValue NodePrototype::method_get_parentNode(SimpleCallContext *ctx)
         return Encode::null();
 }
 
-ReturnedValue NodePrototype::method_get_childNodes(SimpleCallContext *ctx)
+ReturnedValue NodePrototype::method_get_childNodes(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -498,7 +498,7 @@ ReturnedValue NodePrototype::method_get_childNodes(SimpleCallContext *ctx)
     return NodeList::create(engine, r->d);
 }
 
-ReturnedValue NodePrototype::method_get_firstChild(SimpleCallContext *ctx)
+ReturnedValue NodePrototype::method_get_firstChild(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -513,7 +513,7 @@ ReturnedValue NodePrototype::method_get_firstChild(SimpleCallContext *ctx)
         return Node::create(engine, r->d->children.first());
 }
 
-ReturnedValue NodePrototype::method_get_lastChild(SimpleCallContext *ctx)
+ReturnedValue NodePrototype::method_get_lastChild(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -528,7 +528,7 @@ ReturnedValue NodePrototype::method_get_lastChild(SimpleCallContext *ctx)
         return Node::create(engine, r->d->children.last());
 }
 
-ReturnedValue NodePrototype::method_get_previousSibling(SimpleCallContext *ctx)
+ReturnedValue NodePrototype::method_get_previousSibling(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -552,7 +552,7 @@ ReturnedValue NodePrototype::method_get_previousSibling(SimpleCallContext *ctx)
     return Encode::null();
 }
 
-ReturnedValue NodePrototype::method_get_nextSibling(SimpleCallContext *ctx)
+ReturnedValue NodePrototype::method_get_nextSibling(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -576,7 +576,7 @@ ReturnedValue NodePrototype::method_get_nextSibling(SimpleCallContext *ctx)
     return Encode::null();
 }
 
-ReturnedValue NodePrototype::method_get_attributes(SimpleCallContext *ctx)
+ReturnedValue NodePrototype::method_get_attributes(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -670,7 +670,7 @@ ReturnedValue Attr::prototype(ExecutionEngine *engine)
     return d->attrPrototype.value();
 }
 
-ReturnedValue Attr::method_name(SimpleCallContext *ctx)
+ReturnedValue Attr::method_name(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -681,7 +681,7 @@ ReturnedValue Attr::method_name(SimpleCallContext *ctx)
     return engine->toString(r->d->name);
 }
 
-ReturnedValue Attr::method_value(SimpleCallContext *ctx)
+ReturnedValue Attr::method_value(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -692,7 +692,7 @@ ReturnedValue Attr::method_value(SimpleCallContext *ctx)
     return engine->toString(r->d->data);
 }
 
-ReturnedValue Attr::method_ownerElement(SimpleCallContext *ctx)
+ReturnedValue Attr::method_ownerElement(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -703,7 +703,7 @@ ReturnedValue Attr::method_ownerElement(SimpleCallContext *ctx)
     return Node::create(engine, r->d->parent);
 }
 
-ReturnedValue CharacterData::method_length(SimpleCallContext *ctx)
+ReturnedValue CharacterData::method_length(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -730,7 +730,7 @@ ReturnedValue CharacterData::prototype(ExecutionEngine *v4)
     return d->characterDataPrototype.value();
 }
 
-ReturnedValue Text::method_isElementContentWhitespace(SimpleCallContext *ctx)
+ReturnedValue Text::method_isElementContentWhitespace(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -739,7 +739,7 @@ ReturnedValue Text::method_isElementContentWhitespace(SimpleCallContext *ctx)
     return Encode(r->d->data.trimmed().isEmpty());
 }
 
-ReturnedValue Text::method_wholeText(SimpleCallContext *ctx)
+ReturnedValue Text::method_wholeText(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -997,7 +997,7 @@ ReturnedValue NodeList::create(QV8Engine *engine, NodeImpl *data)
     return instance.asReturnedValue();
 }
 
-ReturnedValue Document::method_documentElement(SimpleCallContext *ctx)
+ReturnedValue Document::method_documentElement(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -1008,7 +1008,7 @@ ReturnedValue Document::method_documentElement(SimpleCallContext *ctx)
     return Node::create(engine, static_cast<DocumentImpl *>(r->d)->root);
 }
 
-ReturnedValue Document::method_xmlStandalone(SimpleCallContext *ctx)
+ReturnedValue Document::method_xmlStandalone(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -1019,7 +1019,7 @@ ReturnedValue Document::method_xmlStandalone(SimpleCallContext *ctx)
     return Encode(static_cast<DocumentImpl *>(r->d)->isStandalone);
 }
 
-ReturnedValue Document::method_xmlVersion(SimpleCallContext *ctx)
+ReturnedValue Document::method_xmlVersion(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -1030,7 +1030,7 @@ ReturnedValue Document::method_xmlVersion(SimpleCallContext *ctx)
     return engine->toString(static_cast<DocumentImpl *>(r->d)->version);
 }
 
-ReturnedValue Document::method_xmlEncoding(SimpleCallContext *ctx)
+ReturnedValue Document::method_xmlEncoding(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>());
@@ -1671,18 +1671,18 @@ struct QQmlXMLHttpRequestCtor : public FunctionObject
 
     void setupProto();
 
-    static ReturnedValue method_open(SimpleCallContext *ctx);
-    static ReturnedValue method_setRequestHeader(SimpleCallContext *ctx);
-    static ReturnedValue method_send(SimpleCallContext *ctx);
-    static ReturnedValue method_abort(SimpleCallContext *ctx);
-    static ReturnedValue method_getResponseHeader(SimpleCallContext *ctx);
-    static ReturnedValue method_getAllResponseHeaders(SimpleCallContext *ctx);
+    static ReturnedValue method_open(CallContext *ctx);
+    static ReturnedValue method_setRequestHeader(CallContext *ctx);
+    static ReturnedValue method_send(CallContext *ctx);
+    static ReturnedValue method_abort(CallContext *ctx);
+    static ReturnedValue method_getResponseHeader(CallContext *ctx);
+    static ReturnedValue method_getAllResponseHeaders(CallContext *ctx);
 
-    static ReturnedValue method_get_readyState(SimpleCallContext *ctx);
-    static ReturnedValue method_get_status(SimpleCallContext *ctx);
-    static ReturnedValue method_get_statusText(SimpleCallContext *ctx);
-    static ReturnedValue method_get_responseText(SimpleCallContext *ctx);
-    static ReturnedValue method_get_responseXML(SimpleCallContext *ctx);
+    static ReturnedValue method_get_readyState(CallContext *ctx);
+    static ReturnedValue method_get_status(CallContext *ctx);
+    static ReturnedValue method_get_statusText(CallContext *ctx);
+    static ReturnedValue method_get_responseText(CallContext *ctx);
+    static ReturnedValue method_get_responseXML(CallContext *ctx);
 
 
     Object *proto;
@@ -1722,7 +1722,7 @@ void QQmlXMLHttpRequestCtor::setupProto()
 
 
 // XMLHttpRequest methods
-ReturnedValue QQmlXMLHttpRequestCtor::method_open(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_open(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
@@ -1772,7 +1772,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_open(SimpleCallContext *ctx)
     return r->open(meObject, method, url);
 }
 
-ReturnedValue QQmlXMLHttpRequestCtor::method_setRequestHeader(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_setRequestHeader(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
@@ -1819,7 +1819,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_setRequestHeader(SimpleCallContext
     return Encode::undefined();
 }
 
-ReturnedValue QQmlXMLHttpRequestCtor::method_send(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_send(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
@@ -1841,7 +1841,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_send(SimpleCallContext *ctx)
     return r->send(meObject, data);
 }
 
-ReturnedValue QQmlXMLHttpRequestCtor::method_abort(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_abort(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
@@ -1853,7 +1853,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_abort(SimpleCallContext *ctx)
     return r->abort(meObject);
 }
 
-ReturnedValue QQmlXMLHttpRequestCtor::method_getResponseHeader(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_getResponseHeader(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
@@ -1874,7 +1874,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_getResponseHeader(SimpleCallContext
     return engine->toString(r->header(ctx->callData->args[0].toQStringNoThrow()));
 }
 
-ReturnedValue QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
@@ -1896,7 +1896,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(SimpleCallCon
 }
 
 // XMLHttpRequest properties
-ReturnedValue QQmlXMLHttpRequestCtor::method_get_readyState(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_get_readyState(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
@@ -1907,7 +1907,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_readyState(SimpleCallContext *c
     return Encode(r->readyState());
 }
 
-ReturnedValue QQmlXMLHttpRequestCtor::method_get_status(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_get_status(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
@@ -1925,7 +1925,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_status(SimpleCallContext *ctx)
         return Encode(r->replyStatus());
 }
 
-ReturnedValue QQmlXMLHttpRequestCtor::method_get_statusText(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_get_statusText(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
@@ -1945,7 +1945,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_statusText(SimpleCallContext *c
         return engine->toString(r->replyStatusText());
 }
 
-ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseText(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseText(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
@@ -1962,7 +1962,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseText(SimpleCallContext
         return engine->toString(r->responseBody());
 }
 
-ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseXML(SimpleCallContext *ctx)
+ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseXML(CallContext *ctx)
 {
     Scope scope(ctx);
     Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index adbd4da0eb..c80a742af0 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -158,7 +158,7 @@ QV4::QtObject::QtObject(ExecutionEngine *v4, QQmlEngine *qmlEngine)
 \qmlmethod bool Qt::isQtObject(object)
 Returns true if \c object is a valid reference to a Qt or QML object, otherwise false.
 */
-ReturnedValue QtObject::method_isQtObject(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_isQtObject(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc == 0)
         return QV4::Encode(false);
@@ -172,7 +172,7 @@ ReturnedValue QtObject::method_isQtObject(QV4::SimpleCallContext *ctx)
 Returns a color with the specified \c red, \c green, \c blue and \c alpha components.
 All components should be in the range 0-1 inclusive.
 */
-ReturnedValue QtObject::method_rgba(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_rgba(QV4::CallContext *ctx)
 {
     int argCount = ctx->callData->argc;
     if (argCount < 3 || argCount > 4)
@@ -201,7 +201,7 @@ ReturnedValue QtObject::method_rgba(QV4::SimpleCallContext *ctx)
 Returns a color with the specified \c hue, \c saturation, \c lightness and \c alpha components.
 All components should be in the range 0-1 inclusive.
 */
-ReturnedValue QtObject::method_hsla(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_hsla(QV4::CallContext *ctx)
 {
     int argCount = ctx->callData->argc;
     if (argCount < 3 || argCount > 4)
@@ -232,7 +232,7 @@ may be either color values or string values.  If a string value is supplied it
 must be convertible to a color, as described for the \l{colorbasictypedocs}{color}
 basic type.
 */
-ReturnedValue QtObject::method_colorEqual(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_colorEqual(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 2)
         V4THROW_ERROR("Qt.colorEqual(): Invalid arguments");
@@ -272,7 +272,7 @@ Returns a \c rect with the top-left corner at \c x, \c y and the specified \c wi
 
 The returned object has \c x, \c y, \c width and \c height attributes with the given values.
 */
-ReturnedValue QtObject::method_rect(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_rect(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 4)
         V4THROW_ERROR("Qt.rect(): Invalid arguments");
@@ -289,7 +289,7 @@ ReturnedValue QtObject::method_rect(QV4::SimpleCallContext *ctx)
 \qmlmethod point Qt::point(int x, int y)
 Returns a Point with the specified \c x and \c y coordinates.
 */
-ReturnedValue QtObject::method_point(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_point(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 2)
         V4THROW_ERROR("Qt.point(): Invalid arguments");
@@ -304,7 +304,7 @@ ReturnedValue QtObject::method_point(QV4::SimpleCallContext *ctx)
 \qmlmethod Qt::size(int width, int height)
 Returns a Size with the specified \c width and \c height.
 */
-ReturnedValue QtObject::method_size(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_size(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 2)
         V4THROW_ERROR("Qt.size(): Invalid arguments");
@@ -323,7 +323,7 @@ key-value pairs where valid keys are the \l{fontbasictypedocs}{font} type's
 subproperty names, and the values are valid values for each subproperty.
 Invalid keys will be ignored.
 */
-ReturnedValue QtObject::method_font(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_font(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 1 || !ctx->callData->args[0].isObject())
         V4THROW_ERROR("Qt.font(): Invalid arguments");
@@ -342,7 +342,7 @@ ReturnedValue QtObject::method_font(QV4::SimpleCallContext *ctx)
 \qmlmethod Qt::vector2d(real x, real y)
 Returns a Vector2D with the specified \c x and \c y.
 */
-ReturnedValue QtObject::method_vector2d(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_vector2d(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 2)
         V4THROW_ERROR("Qt.vector2d(): Invalid arguments");
@@ -360,7 +360,7 @@ ReturnedValue QtObject::method_vector2d(QV4::SimpleCallContext *ctx)
 \qmlmethod Qt::vector3d(real x, real y, real z)
 Returns a Vector3D with the specified \c x, \c y and \c z.
 */
-ReturnedValue QtObject::method_vector3d(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_vector3d(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 3)
         V4THROW_ERROR("Qt.vector3d(): Invalid arguments");
@@ -379,7 +379,7 @@ ReturnedValue QtObject::method_vector3d(QV4::SimpleCallContext *ctx)
 \qmlmethod Qt::vector4d(real x, real y, real z, real w)
 Returns a Vector4D with the specified \c x, \c y, \c z and \c w.
 */
-ReturnedValue QtObject::method_vector4d(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_vector4d(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 4)
         V4THROW_ERROR("Qt.vector4d(): Invalid arguments");
@@ -399,7 +399,7 @@ ReturnedValue QtObject::method_vector4d(QV4::SimpleCallContext *ctx)
 \qmlmethod Qt::quaternion(real scalar, real x, real y, real z)
 Returns a Quaternion with the specified \c scalar, \c x, \c y, and \c z.
 */
-ReturnedValue QtObject::method_quaternion(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_quaternion(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 4)
         V4THROW_ERROR("Qt.quaternion(): Invalid arguments");
@@ -422,7 +422,7 @@ Alternatively, the function may be called with a single argument
 where that argument is a JavaScript array which contains the sixteen
 matrix values.
 */
-ReturnedValue QtObject::method_matrix4x4(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_matrix4x4(QV4::CallContext *ctx)
 {
     QV8Engine *v8engine = ctx->engine->v8Engine;
 
@@ -473,7 +473,7 @@ by factor and converts the color back to RGB.
 
 If \c factor is not supplied, returns a color 50% lighter than \c baseColor (factor 1.5).
 */
-ReturnedValue QtObject::method_lighter(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_lighter(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 1 && ctx->callData->argc != 2)
         V4THROW_ERROR("Qt.lighter(): Invalid arguments");
@@ -512,7 +512,7 @@ by factor and converts the color back to RGB.
 
 If \c factor is not supplied, returns a color 50% darker than \c baseColor (factor 2.0).
 */
-ReturnedValue QtObject::method_darker(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_darker(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 1 && ctx->callData->argc != 2)
         V4THROW_ERROR("Qt.darker(): Invalid arguments");
@@ -560,7 +560,7 @@ ReturnedValue QtObject::method_darker(QV4::SimpleCallContext *ctx)
 
     Tint is most useful when a subtle change is intended to be conveyed due to some event; you can then use tinting to more effectively tune the visible color.
 */
-ReturnedValue QtObject::method_tint(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_tint(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 2)
         V4THROW_ERROR("Qt.tint(): Invalid arguments");
@@ -610,7 +610,7 @@ If \a format is not specified, \a date is formatted using
 
 \sa Locale
 */
-ReturnedValue QtObject::method_formatDate(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_formatDate(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc < 1 || ctx->callData->argc > 2)
         V4THROW_ERROR("Qt.formatDate(): Invalid arguments");
@@ -655,7 +655,7 @@ If \a format is not specified, \a time is formatted using
 
 \sa Locale
 */
-ReturnedValue QtObject::method_formatTime(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_formatTime(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc < 1 || ctx->callData->argc > 2)
         V4THROW_ERROR("Qt.formatTime(): Invalid arguments");
@@ -781,7 +781,7 @@ with the \a format values below to produce the following results:
 
     \sa Locale
 */
-ReturnedValue QtObject::method_formatDateTime(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_formatDateTime(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc < 1 || ctx->callData->argc > 2)
         V4THROW_ERROR("Qt.formatDateTime(): Invalid arguments");
@@ -815,7 +815,7 @@ ReturnedValue QtObject::method_formatDateTime(QV4::SimpleCallContext *ctx)
 \qmlmethod bool Qt::openUrlExternally(url target)
 Attempts to open the specified \c target url in an external application, based on the user's desktop preferences. Returns true if it succeeds, and false otherwise.
 */
-ReturnedValue QtObject::method_openUrlExternally(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_openUrlExternally(QV4::CallContext *ctx)
 {
     if (ctx->callData->argc != 1)
         return QV4::Encode(false);
@@ -830,7 +830,7 @@ ReturnedValue QtObject::method_openUrlExternally(QV4::SimpleCallContext *ctx)
   \qmlmethod url Qt::resolvedUrl(url url)
   Returns \a url resolved relative to the URL of the caller.
 */
-ReturnedValue QtObject::method_resolvedUrl(QV4::SimpleCallContext *ctx)
+ReturnedValue QtObject::method_resolvedUrl(QV4::CallContext *ctx)
 {
     QV8Engine *v8engine = ctx->engine->v8Engine;
 
@@ -853,7 +853,7 @@ ReturnedValue QtObject::method_resolvedUrl(QV4::SimpleCallContext *ctx)
 \qmlmethod list<string> Qt::fontFamilies()
 Returns a list of the font families available to the application.
 */
-ReturnedValue QtObject::method_fontFamilies(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_fontFamilies(CallContext *ctx)
 {
     if (ctx->callData->argc != 0)
         V4THROW_ERROR("Qt.fontFamilies(): Invalid arguments");
@@ -866,7 +866,7 @@ ReturnedValue QtObject::method_fontFamilies(SimpleCallContext *ctx)
 \qmlmethod string Qt::md5(data)
 Returns a hex string of the md5 hash of \c data.
 */
-ReturnedValue QtObject::method_md5(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_md5(CallContext *ctx)
 {
     if (ctx->callData->argc != 1)
         V4THROW_ERROR("Qt.md5(): Invalid arguments");
@@ -880,7 +880,7 @@ ReturnedValue QtObject::method_md5(SimpleCallContext *ctx)
 \qmlmethod string Qt::btoa(data)
 Binary to ASCII - this function returns a base64 encoding of \c data.
 */
-ReturnedValue QtObject::method_btoa(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_btoa(CallContext *ctx)
 {
     if (ctx->callData->argc != 1)
         V4THROW_ERROR("Qt.btoa(): Invalid arguments");
@@ -894,7 +894,7 @@ ReturnedValue QtObject::method_btoa(SimpleCallContext *ctx)
 \qmlmethod string Qt::atob(data)
 ASCII to binary - this function returns a base64 decoding of \c data.
 */
-ReturnedValue QtObject::method_atob(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_atob(CallContext *ctx)
 {
     if (ctx->callData->argc != 1)
         V4THROW_ERROR("Qt.atob(): Invalid arguments");
@@ -911,7 +911,7 @@ Within the \l {Prototyping with qmlscene}, this causes the launcher application
 to quit a C++ application when this method is called, connect the
 QQmlEngine::quit() signal to the QCoreApplication::quit() slot.
 */
-ReturnedValue QtObject::method_quit(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_quit(CallContext *ctx)
 {
     QV8Engine *v8engine = ctx->engine->v8Engine;
 
@@ -943,7 +943,7 @@ If this is the case, consider using \l{QtQml::Qt::createComponent()}{Qt.createCo
 
 See \l {Dynamic QML Object Creation from JavaScript} for more information on using this function.
 */
-ReturnedValue QtObject::method_createQmlObject(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_createQmlObject(CallContext *ctx)
 {
     Scope scope(ctx);
     if (ctx->callData->argc < 2 || ctx->callData->argc > 3)
@@ -1075,7 +1075,7 @@ See \l {Dynamic QML Object Creation from JavaScript} for more information on usi
 To create a QML object from an arbitrary string of QML (instead of a file),
 use \l{QtQml::Qt::createQmlObject()}{Qt.createQmlObject()}.
 */
-ReturnedValue QtObject::method_createComponent(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_createComponent(CallContext *ctx)
 {
     if (ctx->callData->argc < 1 || ctx->callData->argc > 3)
         return ctx->throwError(QStringLiteral("Qt.createComponent(): Invalid arguments"));
@@ -1159,7 +1159,7 @@ ReturnedValue QtObject::method_createComponent(SimpleCallContext *ctx)
 
     \sa QtQuick::Locale
 */
-ReturnedValue QtObject::method_locale(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_locale(CallContext *ctx)
 {
     QString code;
     if (ctx->callData->argc > 1)
@@ -1253,7 +1253,7 @@ DEFINE_MANAGED_VTABLE(BindingFunction);
 
     \since 5.0
 */
-ReturnedValue QtObject::method_binding(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_binding(CallContext *ctx)
 {
     if (ctx->callData->argc != 1)
         V4THROW_ERROR("binding() requires 1 argument");
@@ -1265,7 +1265,7 @@ ReturnedValue QtObject::method_binding(SimpleCallContext *ctx)
 }
 
 
-ReturnedValue QtObject::method_get_platform(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_get_platform(CallContext *ctx)
 {
     // ### inefficient. Should be just a value based getter
     Object *o = ctx->callData->thisObject.asObject();
@@ -1282,7 +1282,7 @@ ReturnedValue QtObject::method_get_platform(SimpleCallContext *ctx)
     return QV4::QObjectWrapper::wrap(ctx->engine, qt->m_platform);
 }
 
-ReturnedValue QtObject::method_get_application(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_get_application(CallContext *ctx)
 {
     // ### inefficient. Should be just a value based getter
     Object *o = ctx->callData->thisObject.asObject();
@@ -1300,7 +1300,7 @@ ReturnedValue QtObject::method_get_application(SimpleCallContext *ctx)
 }
 
 #ifndef QT_NO_IM
-ReturnedValue QtObject::method_get_inputMethod(SimpleCallContext *ctx)
+ReturnedValue QtObject::method_get_inputMethod(CallContext *ctx)
 {
     QObject *o = QQml_guiProvider()->inputMethod();
     QQmlEngine::setObjectOwnership(o, QQmlEngine::CppOwnership);
@@ -1364,7 +1364,7 @@ static QString jsStack(QV4::ExecutionEngine *engine) {
     return stack;
 }
 
-static QV4::ReturnedValue writeToConsole(ConsoleLogTypes logType, SimpleCallContext *ctx,
+static QV4::ReturnedValue writeToConsole(ConsoleLogTypes logType, CallContext *ctx,
                                          bool printStack = false)
 {
     QString result;
@@ -1406,12 +1406,12 @@ static QV4::ReturnedValue writeToConsole(ConsoleLogTypes logType, SimpleCallCont
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue ConsoleObject::method_error(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_error(CallContext *ctx)
 {
     return writeToConsole(Error, ctx);
 }
 
-QV4::ReturnedValue ConsoleObject::method_log(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_log(CallContext *ctx)
 {
     //console.log
     //console.debug
@@ -1420,7 +1420,7 @@ QV4::ReturnedValue ConsoleObject::method_log(SimpleCallContext *ctx)
     return writeToConsole(Log, ctx);
 }
 
-QV4::ReturnedValue ConsoleObject::method_profile(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_profile(CallContext *ctx)
 {
     //DeclarativeDebugTrace cannot handle nested profiling
     //although v8 can handle several profiling at once,
@@ -1443,7 +1443,7 @@ QV4::ReturnedValue ConsoleObject::method_profile(SimpleCallContext *ctx)
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue ConsoleObject::method_profileEnd(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_profileEnd(CallContext *ctx)
 {
     //DeclarativeDebugTrace cannot handle nested profiling
     //although v8 can handle several profiling at once,
@@ -1471,7 +1471,7 @@ QV4::ReturnedValue ConsoleObject::method_profileEnd(SimpleCallContext *ctx)
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue ConsoleObject::method_time(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_time(CallContext *ctx)
 {
     if (ctx->callData->argc != 1)
         V4THROW_ERROR("console.time(): Invalid arguments");
@@ -1483,7 +1483,7 @@ QV4::ReturnedValue ConsoleObject::method_time(SimpleCallContext *ctx)
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue ConsoleObject::method_timeEnd(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_timeEnd(CallContext *ctx)
 {
     if (ctx->callData->argc != 1)
         V4THROW_ERROR("console.time(): Invalid arguments");
@@ -1499,7 +1499,7 @@ QV4::ReturnedValue ConsoleObject::method_timeEnd(SimpleCallContext *ctx)
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue ConsoleObject::method_count(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_count(CallContext *ctx)
 {
     // first argument: name to print. Ignore any additional arguments
     QString name;
@@ -1523,7 +1523,7 @@ QV4::ReturnedValue ConsoleObject::method_count(SimpleCallContext *ctx)
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue ConsoleObject::method_trace(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_trace(CallContext *ctx)
 {
     if (ctx->callData->argc != 0)
         V4THROW_ERROR("console.trace(): Invalid arguments");
@@ -1540,12 +1540,12 @@ QV4::ReturnedValue ConsoleObject::method_trace(SimpleCallContext *ctx)
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue ConsoleObject::method_warn(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_warn(CallContext *ctx)
 {
     return writeToConsole(Warn, ctx);
 }
 
-QV4::ReturnedValue ConsoleObject::method_assert(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_assert(CallContext *ctx)
 {
     if (ctx->callData->argc == 0)
         V4THROW_ERROR("console.assert(): Missing argument");
@@ -1572,7 +1572,7 @@ QV4::ReturnedValue ConsoleObject::method_assert(SimpleCallContext *ctx)
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue ConsoleObject::method_exception(SimpleCallContext *ctx)
+QV4::ReturnedValue ConsoleObject::method_exception(CallContext *ctx)
 {
     if (ctx->callData->argc == 0)
         V4THROW_ERROR("console.exception(): Missing argument");
@@ -1630,7 +1630,7 @@ void QV4::GlobalExtensions::init(QQmlEngine *qmlEngine, Object *globalObject)
 
     \sa {Internationalization and Localization with Qt Quick}
 */
-ReturnedValue GlobalExtensions::method_qsTranslate(SimpleCallContext *ctx)
+ReturnedValue GlobalExtensions::method_qsTranslate(CallContext *ctx)
 {
     if (ctx->callData->argc < 2)
         V4THROW_ERROR("qsTranslate() requires at least two arguments");
@@ -1686,7 +1686,7 @@ ReturnedValue GlobalExtensions::method_qsTranslate(SimpleCallContext *ctx)
 
     \sa {Internationalization and Localization with Qt Quick}
 */
-ReturnedValue GlobalExtensions::method_qsTranslateNoOp(SimpleCallContext *ctx)
+ReturnedValue GlobalExtensions::method_qsTranslateNoOp(CallContext *ctx)
 {
     if (ctx->callData->argc < 2)
         return QV4::Encode::undefined();
@@ -1710,7 +1710,7 @@ ReturnedValue GlobalExtensions::method_qsTranslateNoOp(SimpleCallContext *ctx)
 
     \sa {Internationalization and Localization with Qt Quick}
 */
-ReturnedValue GlobalExtensions::method_qsTr(SimpleCallContext *ctx)
+ReturnedValue GlobalExtensions::method_qsTr(CallContext *ctx)
 {
     if (ctx->callData->argc < 1)
         V4THROW_ERROR("qsTr() requires at least one argument");
@@ -1764,7 +1764,7 @@ ReturnedValue GlobalExtensions::method_qsTr(SimpleCallContext *ctx)
 
     \sa {Internationalization and Localization with Qt Quick}
 */
-ReturnedValue GlobalExtensions::method_qsTrNoOp(SimpleCallContext *ctx)
+ReturnedValue GlobalExtensions::method_qsTrNoOp(CallContext *ctx)
 {
     if (ctx->callData->argc < 1)
         return QV4::Encode::undefined();
@@ -1801,7 +1801,7 @@ ReturnedValue GlobalExtensions::method_qsTrNoOp(SimpleCallContext *ctx)
 
     \sa QT_TRID_NOOP, {Internationalization and Localization with Qt Quick}
 */
-ReturnedValue GlobalExtensions::method_qsTrId(SimpleCallContext *ctx)
+ReturnedValue GlobalExtensions::method_qsTrId(CallContext *ctx)
 {
     if (ctx->callData->argc < 1)
         V4THROW_ERROR("qsTrId() requires at least one argument");
@@ -1833,7 +1833,7 @@ ReturnedValue GlobalExtensions::method_qsTrId(SimpleCallContext *ctx)
 
     \sa qsTrId(), {Internationalization and Localization with Qt Quick}
 */
-ReturnedValue GlobalExtensions::method_qsTrIdNoOp(SimpleCallContext *ctx)
+ReturnedValue GlobalExtensions::method_qsTrIdNoOp(CallContext *ctx)
 {
     if (ctx->callData->argc < 1)
         return QV4::Encode::undefined();
@@ -1842,7 +1842,7 @@ ReturnedValue GlobalExtensions::method_qsTrIdNoOp(SimpleCallContext *ctx)
 #endif // QT_NO_TRANSLATION
 
 
-QV4::ReturnedValue GlobalExtensions::method_gc(SimpleCallContext *ctx)
+QV4::ReturnedValue GlobalExtensions::method_gc(CallContext *ctx)
 {
     ctx->engine->memoryManager->runGC();
 
@@ -1851,7 +1851,7 @@ QV4::ReturnedValue GlobalExtensions::method_gc(SimpleCallContext *ctx)
 
 
 
-ReturnedValue GlobalExtensions::method_string_arg(SimpleCallContext *ctx)
+ReturnedValue GlobalExtensions::method_string_arg(CallContext *ctx)
 {
     if (ctx->callData->argc != 1)
         V4THROW_ERROR("String.arg(): Invalid arguments");
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
index 070796f03c..90536c09dd 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
@@ -68,41 +68,41 @@ struct QtObject : Object
     Q_MANAGED
     QtObject(ExecutionEngine *v4, QQmlEngine *qmlEngine);
 
-    static ReturnedValue method_isQtObject(SimpleCallContext *ctx);
-    static ReturnedValue method_rgba(SimpleCallContext *ctx);
-    static ReturnedValue method_hsla(SimpleCallContext *ctx);
-    static ReturnedValue method_colorEqual(SimpleCallContext *ctx);
-    static ReturnedValue method_font(SimpleCallContext *ctx);
-    static ReturnedValue method_rect(SimpleCallContext *ctx);
-    static ReturnedValue method_point(SimpleCallContext *ctx);
-    static ReturnedValue method_size(SimpleCallContext *ctx);
-    static ReturnedValue method_vector2d(SimpleCallContext *ctx);
-    static ReturnedValue method_vector3d(SimpleCallContext *ctx);
-    static ReturnedValue method_vector4d(SimpleCallContext *ctx);
-    static ReturnedValue method_quaternion(SimpleCallContext *ctx);
-    static ReturnedValue method_matrix4x4(SimpleCallContext *ctx);
-    static ReturnedValue method_lighter(SimpleCallContext *ctx);
-    static ReturnedValue method_darker(SimpleCallContext *ctx);
-    static ReturnedValue method_tint(SimpleCallContext *ctx);
-    static ReturnedValue method_formatDate(SimpleCallContext *ctx);
-    static ReturnedValue method_formatTime(SimpleCallContext *ctx);
-    static ReturnedValue method_formatDateTime(SimpleCallContext *ctx);
-    static ReturnedValue method_openUrlExternally(SimpleCallContext *ctx);
-    static ReturnedValue method_fontFamilies(SimpleCallContext *ctx);
-    static ReturnedValue method_md5(SimpleCallContext *ctx);
-    static ReturnedValue method_btoa(SimpleCallContext *ctx);
-    static ReturnedValue method_atob(SimpleCallContext *ctx);
-    static ReturnedValue method_quit(SimpleCallContext *ctx);
-    static ReturnedValue method_resolvedUrl(SimpleCallContext *ctx);
-    static ReturnedValue method_createQmlObject(SimpleCallContext *ctx);
-    static ReturnedValue method_createComponent(SimpleCallContext *ctx);
-    static ReturnedValue method_locale(SimpleCallContext *ctx);
-    static ReturnedValue method_binding(SimpleCallContext *ctx);
-
-    static ReturnedValue method_get_platform(SimpleCallContext *ctx);
-    static ReturnedValue method_get_application(SimpleCallContext *ctx);
+    static ReturnedValue method_isQtObject(CallContext *ctx);
+    static ReturnedValue method_rgba(CallContext *ctx);
+    static ReturnedValue method_hsla(CallContext *ctx);
+    static ReturnedValue method_colorEqual(CallContext *ctx);
+    static ReturnedValue method_font(CallContext *ctx);
+    static ReturnedValue method_rect(CallContext *ctx);
+    static ReturnedValue method_point(CallContext *ctx);
+    static ReturnedValue method_size(CallContext *ctx);
+    static ReturnedValue method_vector2d(CallContext *ctx);
+    static ReturnedValue method_vector3d(CallContext *ctx);
+    static ReturnedValue method_vector4d(CallContext *ctx);
+    static ReturnedValue method_quaternion(CallContext *ctx);
+    static ReturnedValue method_matrix4x4(CallContext *ctx);
+    static ReturnedValue method_lighter(CallContext *ctx);
+    static ReturnedValue method_darker(CallContext *ctx);
+    static ReturnedValue method_tint(CallContext *ctx);
+    static ReturnedValue method_formatDate(CallContext *ctx);
+    static ReturnedValue method_formatTime(CallContext *ctx);
+    static ReturnedValue method_formatDateTime(CallContext *ctx);
+    static ReturnedValue method_openUrlExternally(CallContext *ctx);
+    static ReturnedValue method_fontFamilies(CallContext *ctx);
+    static ReturnedValue method_md5(CallContext *ctx);
+    static ReturnedValue method_btoa(CallContext *ctx);
+    static ReturnedValue method_atob(CallContext *ctx);
+    static ReturnedValue method_quit(CallContext *ctx);
+    static ReturnedValue method_resolvedUrl(CallContext *ctx);
+    static ReturnedValue method_createQmlObject(CallContext *ctx);
+    static ReturnedValue method_createComponent(CallContext *ctx);
+    static ReturnedValue method_locale(CallContext *ctx);
+    static ReturnedValue method_binding(CallContext *ctx);
+
+    static ReturnedValue method_get_platform(CallContext *ctx);
+    static ReturnedValue method_get_application(CallContext *ctx);
 #ifndef QT_NO_IM
-    static ReturnedValue method_get_inputMethod(SimpleCallContext *ctx);
+    static ReturnedValue method_get_inputMethod(CallContext *ctx);
 #endif
 
     QObject *m_platform;
@@ -113,17 +113,17 @@ struct ConsoleObject : Object
 {
     ConsoleObject(ExecutionEngine *v4);
 
-    static ReturnedValue method_error(SimpleCallContext *ctx);
-    static ReturnedValue method_log(SimpleCallContext *ctx);
-    static ReturnedValue method_profile(SimpleCallContext *ctx);
-    static ReturnedValue method_profileEnd(SimpleCallContext *ctx);
-    static ReturnedValue method_time(SimpleCallContext *ctx);
-    static ReturnedValue method_timeEnd(SimpleCallContext *ctx);
-    static ReturnedValue method_count(SimpleCallContext *ctx);
-    static ReturnedValue method_trace(SimpleCallContext *ctx);
-    static ReturnedValue method_warn(SimpleCallContext *ctx);
-    static ReturnedValue method_assert(SimpleCallContext *ctx);
-    static ReturnedValue method_exception(SimpleCallContext *ctx);
+    static ReturnedValue method_error(CallContext *ctx);
+    static ReturnedValue method_log(CallContext *ctx);
+    static ReturnedValue method_profile(CallContext *ctx);
+    static ReturnedValue method_profileEnd(CallContext *ctx);
+    static ReturnedValue method_time(CallContext *ctx);
+    static ReturnedValue method_timeEnd(CallContext *ctx);
+    static ReturnedValue method_count(CallContext *ctx);
+    static ReturnedValue method_trace(CallContext *ctx);
+    static ReturnedValue method_warn(CallContext *ctx);
+    static ReturnedValue method_assert(CallContext *ctx);
+    static ReturnedValue method_exception(CallContext *ctx);
 
 };
 
@@ -131,17 +131,17 @@ struct GlobalExtensions {
     static void init(QQmlEngine *qmlEngine, Object *globalObject);
 
 #ifndef QT_NO_TRANSLATION
-    static ReturnedValue method_qsTranslate(SimpleCallContext *ctx);
-    static ReturnedValue method_qsTranslateNoOp(SimpleCallContext *ctx);
-    static ReturnedValue method_qsTr(SimpleCallContext *ctx);
-    static ReturnedValue method_qsTrNoOp(SimpleCallContext *ctx);
-    static ReturnedValue method_qsTrId(SimpleCallContext *ctx);
-    static ReturnedValue method_qsTrIdNoOp(SimpleCallContext *ctx);
+    static ReturnedValue method_qsTranslate(CallContext *ctx);
+    static ReturnedValue method_qsTranslateNoOp(CallContext *ctx);
+    static ReturnedValue method_qsTr(CallContext *ctx);
+    static ReturnedValue method_qsTrNoOp(CallContext *ctx);
+    static ReturnedValue method_qsTrId(CallContext *ctx);
+    static ReturnedValue method_qsTrIdNoOp(CallContext *ctx);
 #endif
-    static ReturnedValue method_gc(SimpleCallContext *ctx);
+    static ReturnedValue method_gc(CallContext *ctx);
 
     // on String:prototype
-    static ReturnedValue method_string_arg(SimpleCallContext *ctx);
+    static ReturnedValue method_string_arg(CallContext *ctx);
 
 };
 
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index cdd5f8583a..754d008745 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -1704,7 +1704,7 @@ int QQmlDelegateModelItemMetaType::parseGroups(const QV4::ValueRef groups) const
     return groupFlags;
 }
 
-QV4::ReturnedValue QQmlDelegateModelItem::get_model(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlDelegateModelItem::get_model(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlDelegateModelItemObject> o(scope, ctx->callData->thisObject.as<QQmlDelegateModelItemObject>());
@@ -1716,7 +1716,7 @@ QV4::ReturnedValue QQmlDelegateModelItem::get_model(QV4::SimpleCallContext *ctx)
     return o->item->get();
 }
 
-QV4::ReturnedValue QQmlDelegateModelItem::get_groups(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlDelegateModelItem::get_groups(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlDelegateModelItemObject> o(scope, ctx->callData->thisObject.as<QQmlDelegateModelItemObject>());
@@ -1732,7 +1732,7 @@ QV4::ReturnedValue QQmlDelegateModelItem::get_groups(QV4::SimpleCallContext *ctx
     return ctx->engine->v8Engine->fromVariant(groups);
 }
 
-QV4::ReturnedValue QQmlDelegateModelItem::set_groups(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQmlDelegateModelItem::set_groups(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlDelegateModelItemObject> o(scope, ctx->callData->thisObject.as<QQmlDelegateModelItemObject>());
@@ -3147,21 +3147,21 @@ struct QQmlDelegateModelGroupChange : QV4::Object
         vtbl = &static_vtbl;
     }
 
-    static QV4::ReturnedValue method_get_index(QV4::SimpleCallContext *ctx) {
+    static QV4::ReturnedValue method_get_index(QV4::CallContext *ctx) {
         QV4::Scope scope(ctx);
         QV4::Scoped<QQmlDelegateModelGroupChange> that(scope, ctx->callData->thisObject.as<QQmlDelegateModelGroupChange>());
         if (!that)
             return ctx->throwTypeError();
         return QV4::Encode(that->change.index);
     }
-    static QV4::ReturnedValue method_get_count(QV4::SimpleCallContext *ctx) {
+    static QV4::ReturnedValue method_get_count(QV4::CallContext *ctx) {
         QV4::Scope scope(ctx);
         QV4::Scoped<QQmlDelegateModelGroupChange> that(scope, ctx->callData->thisObject.as<QQmlDelegateModelGroupChange>());
         if (!that)
             return ctx->throwTypeError();
         return QV4::Encode(that->change.count);
     }
-    static QV4::ReturnedValue method_get_moveId(QV4::SimpleCallContext *ctx) {
+    static QV4::ReturnedValue method_get_moveId(QV4::CallContext *ctx) {
         QV4::Scope scope(ctx);
         QV4::Scoped<QQmlDelegateModelGroupChange> that(scope, ctx->callData->thisObject.as<QQmlDelegateModelGroupChange>());
         if (!that)
diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h
index 8205b5350f..066c8e70e5 100644
--- a/src/qml/types/qqmldelegatemodel_p_p.h
+++ b/src/qml/types/qqmldelegatemodel_p_p.h
@@ -133,9 +133,9 @@ public:
     virtual void setValue(const QString &role, const QVariant &value) { Q_UNUSED(role); Q_UNUSED(value); }
     virtual bool resolveIndex(const QQmlAdaptorModel &, int) { return false; }
 
-    static QV4::ReturnedValue get_model(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue get_groups(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue set_groups(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue get_model(QV4::CallContext *ctx);
+    static QV4::ReturnedValue get_groups(QV4::CallContext *ctx);
+    static QV4::ReturnedValue set_groups(QV4::CallContext *ctx);
     static QV4::ReturnedValue get_member(QQmlDelegateModelItem *thisItem, uint flag, const QV4::ValueRef);
     static QV4::ReturnedValue set_member(QQmlDelegateModelItem *thisItem, uint flag, const QV4::ValueRef arg);
     static QV4::ReturnedValue get_index(QQmlDelegateModelItem *thisItem, uint flag, const QV4::ValueRef arg);
diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index cf19bbc56a..7607febe01 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -181,7 +181,7 @@ public:
 
     int m_nextId;
 
-    static QV4::ReturnedValue method_sendMessage(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_sendMessage(QV4::CallContext *ctx);
 
 signals:
     void stopThread();
@@ -281,7 +281,7 @@ QQuickWorkerScriptEnginePrivate::QQuickWorkerScriptEnginePrivate(QQmlEngine *eng
 {
 }
 
-QV4::ReturnedValue QQuickWorkerScriptEnginePrivate::method_sendMessage(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickWorkerScriptEnginePrivate::method_sendMessage(QV4::CallContext *ctx)
 {
     WorkerEngine *engine = (WorkerEngine*)ctx->engine->v8Engine;
 
diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp
index e8efd46039..9cd5709a49 100644
--- a/src/qml/util/qqmladaptormodel.cpp
+++ b/src/qml/util/qqmladaptormodel.cpp
@@ -63,7 +63,7 @@ public:
 
 V8_DEFINE_EXTENSION(QQmlAdaptorModelEngineData, engineData)
 
-static QV4::ReturnedValue get_index(QV4::SimpleCallContext *ctx)
+static QV4::ReturnedValue get_index(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlDelegateModelItemObject> o(scope, ctx->callData->thisObject.as<QQmlDelegateModelItemObject>());
@@ -108,8 +108,8 @@ public:
     void setValue(const QString &role, const QVariant &value);
     bool resolveIndex(const QQmlAdaptorModel &model, int idx);
 
-    static QV4::ReturnedValue get_property(QV4::SimpleCallContext *ctx, uint propertyId);
-    static QV4::ReturnedValue set_property(QV4::SimpleCallContext *ctx, uint propertyId);
+    static QV4::ReturnedValue get_property(QV4::CallContext *ctx, uint propertyId);
+    static QV4::ReturnedValue set_property(QV4::CallContext *ctx, uint propertyId);
 
     VDMModelDelegateDataType *type;
     QVector<QVariant> cachedData;
@@ -195,7 +195,7 @@ public:
         dataType->watchedRoles += newRoles;
     }
 
-    static QV4::ReturnedValue get_hasModelChildren(QV4::SimpleCallContext *ctx)
+    static QV4::ReturnedValue get_hasModelChildren(QV4::CallContext *ctx)
     {
         QV4::Scope scope(ctx);
         QV4::Scoped<QQmlDelegateModelItemObject> o(scope, ctx->callData->thisObject.as<QQmlDelegateModelItemObject>());
@@ -339,7 +339,7 @@ bool QQmlDMCachedModelData::resolveIndex(const QQmlAdaptorModel &, int idx)
     }
 }
 
-QV4::ReturnedValue QQmlDMCachedModelData::get_property(QV4::SimpleCallContext *ctx, uint propertyId)
+QV4::ReturnedValue QQmlDMCachedModelData::get_property(QV4::CallContext *ctx, uint propertyId)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlDelegateModelItemObject> o(scope, ctx->callData->thisObject.as<QQmlDelegateModelItemObject>());
@@ -359,7 +359,7 @@ QV4::ReturnedValue QQmlDMCachedModelData::get_property(QV4::SimpleCallContext *c
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue QQmlDMCachedModelData::set_property(QV4::SimpleCallContext *ctx, uint propertyId)
+QV4::ReturnedValue QQmlDMCachedModelData::set_property(QV4::CallContext *ctx, uint propertyId)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQmlDelegateModelItemObject> o(scope, ctx->callData->thisObject.as<QQmlDelegateModelItemObject>());
@@ -579,7 +579,7 @@ public:
         }
     }
 
-    static QV4::ReturnedValue get_modelData(QV4::SimpleCallContext *ctx)
+    static QV4::ReturnedValue get_modelData(QV4::CallContext *ctx)
     {
         QV4::Scope scope(ctx);
         QV4::Scoped<QQmlDelegateModelItemObject> o(scope, ctx->callData->thisObject.as<QQmlDelegateModelItemObject>());
@@ -589,7 +589,7 @@ public:
         return ctx->engine->v8Engine->fromVariant(static_cast<QQmlDMListAccessorData *>(o->item)->cachedData);
     }
 
-    static QV4::ReturnedValue set_modelData(QV4::SimpleCallContext *ctx)
+    static QV4::ReturnedValue set_modelData(QV4::CallContext *ctx)
     {
         QV4::Scope scope(ctx);
         QV4::Scoped<QQmlDelegateModelItemObject> o(scope, ctx->callData->thisObject.as<QQmlDelegateModelItemObject>());
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 99dfff47a2..908e0c91a4 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -488,45 +488,45 @@ public:
     }
     QQuickContext2D* context;
 
-    static QV4::ReturnedValue method_get_globalAlpha(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_globalAlpha(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_globalCompositeOperation(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_globalCompositeOperation(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_fillStyle(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_fillStyle(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_fillRule(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_fillRule(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_strokeStyle(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_strokeStyle(QV4::SimpleCallContext *ctx);
-
-    static QV4::ReturnedValue method_get_lineCap(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_lineCap(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_lineJoin(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_lineJoin(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_lineWidth(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_lineWidth(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_miterLimit(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_miterLimit(QV4::SimpleCallContext *ctx);
-
-    static QV4::ReturnedValue method_get_shadowBlur(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_shadowBlur(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_shadowColor(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_shadowColor(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_shadowOffsetX(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_shadowOffsetX(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_shadowOffsetY(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_shadowOffsetY(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_get_globalAlpha(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_globalAlpha(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_globalCompositeOperation(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_globalCompositeOperation(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_fillStyle(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_fillStyle(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_fillRule(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_fillRule(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_strokeStyle(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_strokeStyle(QV4::CallContext *ctx);
+
+    static QV4::ReturnedValue method_get_lineCap(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_lineCap(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_lineJoin(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_lineJoin(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_lineWidth(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_lineWidth(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_miterLimit(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_miterLimit(QV4::CallContext *ctx);
+
+    static QV4::ReturnedValue method_get_shadowBlur(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_shadowBlur(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_shadowColor(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_shadowColor(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_shadowOffsetX(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_shadowOffsetX(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_shadowOffsetY(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_shadowOffsetY(QV4::CallContext *ctx);
 
     // should these two be on the proto?
-    static QV4::ReturnedValue method_get_path(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_path(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_get_path(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_path(QV4::CallContext *ctx);
 
-    static QV4::ReturnedValue method_get_font(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_font(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_textAlign(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_textAlign(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_textBaseline(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_set_textBaseline(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_get_font(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_font(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_textAlign(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_textAlign(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_textBaseline(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_set_textBaseline(QV4::CallContext *ctx);
 
 protected:
     static void destroy(Managed *that)
@@ -594,50 +594,50 @@ public:
         defineAccessorProperty(QStringLiteral("canvas"), QQuickJSContext2DPrototype::method_get_canvas, 0);
     }
 
-    static QV4::ReturnedValue method_get_canvas(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_restore(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_reset(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_save(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_rotate(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_scale(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_translate(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_setTransform(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_transform(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_resetTransform(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_shear(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_createLinearGradient(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_createRadialGradient(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_createConicalGradient(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_createPattern(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_clearRect(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_fillRect(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_strokeRect(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_arc(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_arcTo(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_beginPath(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_bezierCurveTo(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_clip(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_closePath(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_fill(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_lineTo(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_moveTo(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_quadraticCurveTo(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_rect(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_roundedRect(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_ellipse(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_text(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_stroke(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_isPointInPath(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_drawFocusRing(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_setCaretSelectionRect(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_caretBlinkRate(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_fillText(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_strokeText(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_measureText(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_drawImage(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_createImageData(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_getImageData(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_putImageData(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_get_canvas(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_restore(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_reset(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_save(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_rotate(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_scale(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_translate(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_setTransform(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_transform(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_resetTransform(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_shear(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_createLinearGradient(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_createRadialGradient(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_createConicalGradient(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_createPattern(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_clearRect(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_fillRect(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_strokeRect(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_arc(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_arcTo(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_beginPath(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_bezierCurveTo(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_clip(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_closePath(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_fill(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_lineTo(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_moveTo(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_quadraticCurveTo(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_rect(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_roundedRect(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_ellipse(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_text(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_stroke(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_isPointInPath(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_drawFocusRing(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_setCaretSelectionRect(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_caretBlinkRate(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_fillText(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_strokeText(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_measureText(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_drawImage(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_createImageData(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_getImageData(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_putImageData(QV4::CallContext *ctx);
 
 };
 
@@ -659,7 +659,7 @@ public:
     bool patternRepeatX:1;
     bool patternRepeatY:1;
 
-    static QV4::ReturnedValue gradient_proto_addColorStop(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue gradient_proto_addColorStop(QV4::CallContext *ctx);
 protected:
     static void destroy(Managed *that)
     {
@@ -880,7 +880,7 @@ struct QQuickJSContext2DPixelData : public QV4::Object
     static QV4::ReturnedValue getIndexed(QV4::Managed *m, uint index, bool *hasProperty);
     static void putIndexed(QV4::Managed *m, uint index, const QV4::ValueRef value);
 
-    static QV4::ReturnedValue proto_get_length(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue proto_get_length(QV4::CallContext *ctx);
 
     QImage image;
 };
@@ -904,9 +904,9 @@ struct QQuickJSContext2DImageData : public QV4::Object
         defineAccessorProperty(QStringLiteral("data"), method_get_data, 0);
     }
 
-    static QV4::ReturnedValue method_get_width(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_height(QV4::SimpleCallContext *ctx);
-    static QV4::ReturnedValue method_get_data(QV4::SimpleCallContext *ctx);
+    static QV4::ReturnedValue method_get_width(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_height(QV4::CallContext *ctx);
+    static QV4::ReturnedValue method_get_data(QV4::CallContext *ctx);
 
     static void markObjects(Managed *that, QV4::ExecutionEngine *engine) {
         static_cast<QQuickJSContext2DImageData *>(that)->pixelData.mark(engine);
@@ -950,7 +950,7 @@ static QV4::ReturnedValue qt_create_image_data(qreal w, qreal h, QV8Engine* engi
 
      This property is read only.
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_get_canvas(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_get_canvas(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -966,7 +966,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_get_canvas(QV4::SimpleCall
 
     \sa save()
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_restore(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_restore(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -981,7 +981,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_restore(QV4::SimpleCallCon
     \qmlmethod object QtQuick::Context2D::reset()
     Resets the context state and properties to the default values.
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_reset(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_reset(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1023,7 +1023,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_reset(QV4::SimpleCallConte
     The current path is NOT part of the drawing state. The path can be reset by
     invoking the beginPath() method.
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_save(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_save(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1053,7 +1053,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_save(QV4::SimpleCallContex
     where the \a angle of rotation is in radians.
 
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_rotate(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_rotate(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1082,7 +1082,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_rotate(QV4::SimpleCallCont
 
     \image qml-item-canvas-scale.png
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_scale(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_scale(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1128,7 +1128,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_scale(QV4::SimpleCallConte
 
     \sa transform()
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_setTransform(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_setTransform(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1158,7 +1158,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_setTransform(QV4::SimpleCa
 
     \sa setTransform()
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_transform(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_transform(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1185,7 +1185,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_transform(QV4::SimpleCallC
     Translating the origin enables you to draw patterns of different objects on the canvas
     without having to measure the coordinates manually for each shape.
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_translate(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_translate(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1206,7 +1206,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_translate(QV4::SimpleCallC
 
     \sa transform(), setTransform(), reset()
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_resetTransform(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_resetTransform(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1225,7 +1225,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_resetTransform(QV4::Simple
     Shears the transformation matrix by \a sh in the horizontal direction and
     \a sv in the vertical direction.
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_shear(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_shear(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1246,7 +1246,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_shear(QV4::SimpleCallConte
      The value must be in the range from \c 0.0 (fully transparent) to \c 1.0 (fully opaque).
      The default value is \c 1.0.
 */
-QV4::ReturnedValue QQuickJSContext2D::method_get_globalAlpha(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_globalAlpha(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1256,7 +1256,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_globalAlpha(QV4::SimpleCallCont
     return QV4::Encode(r->context->state.globalAlpha);
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_globalAlpha(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_globalAlpha(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1301,7 +1301,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_globalAlpha(QV4::SimpleCallCont
      extension composition modes are provided as "vendorName-operationName" syntax, for example: QPainter::CompositionMode_Exclusion is provided as
      "qt-exclusion".
 */
-QV4::ReturnedValue QQuickJSContext2D::method_get_globalCompositeOperation(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_globalCompositeOperation(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1311,7 +1311,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_globalCompositeOperation(QV4::S
     return QV4::Encode(ctx->engine->newString(qt_composite_mode_to_string(r->context->state.globalCompositeOperation)));
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_globalCompositeOperation(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_globalCompositeOperation(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1356,7 +1356,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_globalCompositeOperation(QV4::S
      \sa createPattern()
      \sa strokeStyle
  */
-QV4::ReturnedValue QQuickJSContext2D::method_get_fillStyle(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_fillStyle(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1378,7 +1378,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_fillStyle(QV4::SimpleCallContex
     return r->context->m_fillStyle.value();
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_fillStyle(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_fillStyle(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1426,7 +1426,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_fillStyle(QV4::SimpleCallContex
 
      \sa fillStyle
  */
-QV4::ReturnedValue QQuickJSContext2D::method_get_fillRule(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_fillRule(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1437,7 +1437,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_fillRule(QV4::SimpleCallContext
     return engine->fromVariant(r->context->state.fillRule);
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_fillRule(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_fillRule(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1471,7 +1471,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_fillRule(QV4::SimpleCallContext
      \sa createPattern()
      \sa fillStyle
  */
-QV4::ReturnedValue QQuickJSContext2D::method_get_strokeStyle(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_strokeStyle(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1493,7 +1493,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_strokeStyle(QV4::SimpleCallCont
     return r->context->m_strokeStyle.value();
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_strokeStyle(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_strokeStyle(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1548,7 +1548,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_strokeStyle(QV4::SimpleCallCont
     \sa strokeStyle
   */
 
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_createLinearGradient(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_createLinearGradient(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1595,7 +1595,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createLinearGradient(QV4::
     \sa strokeStyle
   */
 
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_createRadialGradient(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_createRadialGradient(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1650,7 +1650,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createRadialGradient(QV4::
     \sa strokeStyle
   */
 
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_createConicalGradient(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_createConicalGradient(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1726,7 +1726,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createConicalGradient(QV4:
   \sa strokeStyle
   \sa fillStyle
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_createPattern(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_createPattern(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1798,7 +1798,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createPattern(QV4::SimpleC
     \endlist
     Other values are ignored.
 */
-QV4::ReturnedValue QQuickJSContext2D::method_get_lineCap(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_lineCap(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1817,7 +1817,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_lineCap(QV4::SimpleCallContext
     return QV4::Encode(ctx->engine->newString(QStringLiteral("butt")));
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_lineCap(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_lineCap(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1856,7 +1856,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_lineCap(QV4::SimpleCallContext
     \endlist
     Other values are ignored.
 */
-QV4::ReturnedValue QQuickJSContext2D::method_get_lineJoin(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_lineJoin(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1875,7 +1875,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_lineJoin(QV4::SimpleCallContext
     return QV4::Encode(ctx->engine->newString(QStringLiteral("miter")));
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_lineJoin(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_lineJoin(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1907,7 +1907,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_lineJoin(QV4::SimpleCallContext
     \qmlproperty real QtQuick::Context2D::lineWidth
      Holds the current line width. Values that are not finite values greater than zero are ignored.
  */
-QV4::ReturnedValue QQuickJSContext2D::method_get_lineWidth(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_lineWidth(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1917,7 +1917,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_lineWidth(QV4::SimpleCallContex
     return QV4::Encode(r->context->state.lineWidth);
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_lineWidth(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_lineWidth(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1938,7 +1938,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_lineWidth(QV4::SimpleCallContex
      Holds the current miter limit ratio.
      The default miter limit value is 10.0.
  */
-QV4::ReturnedValue QQuickJSContext2D::method_get_miterLimit(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_miterLimit(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1948,7 +1948,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_miterLimit(QV4::SimpleCallConte
     return QV4::Encode(r->context->state.miterLimit);
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_miterLimit(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_miterLimit(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1969,7 +1969,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_miterLimit(QV4::SimpleCallConte
     \qmlproperty real QtQuick::Context2D::shadowBlur
      Holds the current level of blur applied to shadows
  */
-QV4::ReturnedValue QQuickJSContext2D::method_get_shadowBlur(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_shadowBlur(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1979,7 +1979,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_shadowBlur(QV4::SimpleCallConte
     return QV4::Encode(r->context->state.shadowBlur);
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_shadowBlur(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_shadowBlur(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -1999,7 +1999,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_shadowBlur(QV4::SimpleCallConte
     \qmlproperty string QtQuick::Context2D::shadowColor
      Holds the current shadow color.
  */
-QV4::ReturnedValue QQuickJSContext2D::method_get_shadowColor(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_shadowColor(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2009,7 +2009,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_shadowColor(QV4::SimpleCallCont
     return QV4::Encode(ctx->engine->newString(r->context->state.shadowColor.name()));
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_shadowColor(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_shadowColor(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2034,7 +2034,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_shadowColor(QV4::SimpleCallCont
 
      \sa shadowOffsetY
  */
-QV4::ReturnedValue QQuickJSContext2D::method_get_shadowOffsetX(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_shadowOffsetX(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2044,7 +2044,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_shadowOffsetX(QV4::SimpleCallCo
     return QV4::Encode(r->context->state.shadowOffsetX);
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_shadowOffsetX(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_shadowOffsetX(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2064,7 +2064,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_shadowOffsetX(QV4::SimpleCallCo
 
      \sa shadowOffsetX
  */
-QV4::ReturnedValue QQuickJSContext2D::method_get_shadowOffsetY(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_shadowOffsetY(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2074,7 +2074,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_shadowOffsetY(QV4::SimpleCallCo
     return QV4::Encode(r->context->state.shadowOffsetY);
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_shadowOffsetY(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_shadowOffsetY(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2089,7 +2089,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_shadowOffsetY(QV4::SimpleCallCo
     return QV4::Encode::undefined();
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_get_path(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_path(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2099,7 +2099,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_path(QV4::SimpleCallContext *ct
     return r->context->m_v4path.value();
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_path(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_path(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2124,7 +2124,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_path(QV4::SimpleCallContext *ct
   \qmlmethod object QtQuick::Context2D::clearRect(real x, real y, real w, real h)
   Clears all pixels on the canvas in the given rectangle to transparent black.
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_clearRect(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_clearRect(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2146,7 +2146,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_clearRect(QV4::SimpleCallC
 
    \sa fillStyle
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_fillRect(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_fillRect(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2168,7 +2168,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_fillRect(QV4::SimpleCallCo
    \sa lineJoin
    \sa miterLimit
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeRect(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeRect(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2202,7 +2202,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeRect(QV4::SimpleCall
     \sa arcTo, {http://www.w3.org/TR/2dcontext/#dom-context-2d-arc}{W3C's 2D
     Context Standard for arc()}
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_arc(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_arc(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2254,7 +2254,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_arc(QV4::SimpleCallContext
     \sa arc, {http://www.w3.org/TR/2dcontext/#dom-context-2d-arcto}{W3C's 2D
     Context Standard for arcTo()}
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_arcTo(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_arcTo(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2282,7 +2282,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_arcTo(QV4::SimpleCallConte
 
    Resets the current path to a new path.
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_beginPath(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_beginPath(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2313,7 +2313,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_beginPath(QV4::SimpleCallC
   \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-beziercurveto}{W3C 2d context standard for bezierCurveTo}
   \sa {http://www.openrise.com/lab/FlowerPower/}{The beautiful flower demo by using bezierCurveTo}
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_bezierCurveTo(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_bezierCurveTo(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2362,7 +2362,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_bezierCurveTo(QV4::SimpleC
     \sa fill()
    \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-clip}{W3C 2d context standard for clip}
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_clip(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_clip(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2380,7 +2380,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_clip(QV4::SimpleCallContex
 
    \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-closepath}{W3C 2d context standard for closePath}
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_closePath(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_closePath(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2402,7 +2402,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_closePath(QV4::SimpleCallC
 
    \sa fillStyle
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_fill(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_fill(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2417,7 +2417,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_fill(QV4::SimpleCallContex
 
    Draws a line from the current position to the point (x, y).
  */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_lineTo(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_lineTo(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2442,7 +2442,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_lineTo(QV4::SimpleCallCont
 
    Creates a new subpath with the given point.
  */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_moveTo(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_moveTo(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2466,7 +2466,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_moveTo(QV4::SimpleCallCont
 
    See \l{http://www.w3.org/TR/2dcontext/#dom-context-2d-quadraticcurveto}{W3C 2d context standard for  for quadraticCurveTo}
  */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_quadraticCurveTo(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_quadraticCurveTo(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2492,7 +2492,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_quadraticCurveTo(QV4::Simp
 
    Adds a rectangle at position (\c x, \c y), with the given width \c w and height \c h, as a closed subpath.
  */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_rect(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_rect(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2509,7 +2509,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_rect(QV4::SimpleCallContex
    Adds the given rectangle rect with rounded corners to the path. The \c xRadius and \c yRadius arguments specify the radius of the
    ellipses defining the corners of the rounded rectangle.
  */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_roundedRect(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_roundedRect(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2533,7 +2533,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_roundedRect(QV4::SimpleCal
 
   The ellipse is composed of a clockwise curve, starting and finishing at zero degrees (the 3 o'clock position).
  */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_ellipse(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_ellipse(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2552,7 +2552,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_ellipse(QV4::SimpleCallCon
   Adds the given \c text to the path as a set of closed subpaths created from the current context font supplied.
   The subpaths are positioned so that the left end of the text's baseline lies at the point specified by (\c x, \c y).
  */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_text(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_text(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2578,7 +2578,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_text(QV4::SimpleCallContex
 
    \sa strokeStyle
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_stroke(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_stroke(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2595,7 +2595,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_stroke(QV4::SimpleCallCont
 
    \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-ispointinpath}{W3C 2d context standard for isPointInPath}
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_isPointInPath(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_isPointInPath(QV4::CallContext *ctx)
 {
     QV4::ExecutionEngine *v4 = ctx->engine;
     QV4::Scope scope(v4);
@@ -2608,21 +2608,21 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_isPointInPath(QV4::SimpleC
     return QV4::Primitive::fromBoolean(pointInPath).asReturnedValue();
 }
 
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_drawFocusRing(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_drawFocusRing(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
 
     V4THROW_DOM(DOMEXCEPTION_NOT_SUPPORTED_ERR, "Context2D::drawFocusRing is not supported");
 }
 
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_setCaretSelectionRect(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_setCaretSelectionRect(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
 
     V4THROW_DOM(DOMEXCEPTION_NOT_SUPPORTED_ERR, "Context2D::setCaretSelectionRect is not supported");
 }
 
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_caretBlinkRate(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_caretBlinkRate(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
 
@@ -2652,7 +2652,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_caretBlinkRate(QV4::Simple
 
     The default font value is "10px sans-serif".
   */
-QV4::ReturnedValue QQuickJSContext2D::method_get_font(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_font(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2661,7 +2661,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_font(QV4::SimpleCallContext *ct
     return QV4::Encode(ctx->engine->newString(r->context->state.font.toString()));
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_font(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_font(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2691,7 +2691,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_font(QV4::SimpleCallContext *ct
   \endlist
   Other values are ignored. The default value is "start".
   */
-QV4::ReturnedValue QQuickJSContext2D::method_get_textAlign(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_textAlign(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2713,7 +2713,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_textAlign(QV4::SimpleCallContex
     return QV4::Encode(ctx->engine->newString(QStringLiteral("start")));
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_textAlign(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_textAlign(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2759,7 +2759,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_textAlign(QV4::SimpleCallContex
   \endlist
   Other values are ignored. The default value is "alphabetic".
   */
-QV4::ReturnedValue QQuickJSContext2D::method_get_textBaseline(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_get_textBaseline(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2781,7 +2781,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_get_textBaseline(QV4::SimpleCallCon
     return QV4::Encode(ctx->engine->newString(QStringLiteral("alphabetic")));
 }
 
-QV4::ReturnedValue QQuickJSContext2D::method_set_textBaseline(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2D::method_set_textBaseline(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2819,7 +2819,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_textBaseline(QV4::SimpleCallCon
   \sa textBaseline
   \sa strokeText
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_fillText(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_fillText(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2843,7 +2843,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_fillText(QV4::SimpleCallCo
   \sa textBaseline
   \sa fillText
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeText(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeText(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2878,7 +2878,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_strokeText(QV4::SimpleCall
   \qmlmethod variant QtQuick::Context2D::measureText(text)
   Returns a TextMetrics object with the metrics of the given text in the current font.
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_measureText(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_measureText(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -2954,7 +2954,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_measureText(QV4::SimpleCal
 
   \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-drawimage}{W3C 2d context standard for drawImage}
 */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_drawImage(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_drawImage(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject);
@@ -3090,7 +3090,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_drawImage(QV4::SimpleCallC
   \qmlproperty int QtQuick::CanvasImageData::width
   Holds the actual width dimension of the data in the ImageData object, in device pixels.
  */
-QV4::ReturnedValue QQuickJSContext2DImageData::method_get_width(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DImageData::method_get_width(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2DImageData> imageData(scope, ctx->callData->thisObject);
@@ -3106,7 +3106,7 @@ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_width(QV4::SimpleCallC
   \qmlproperty int QtQuick::CanvasImageData::height
   Holds the actual height dimension of the data in the ImageData object, in device pixels.
   */
-QV4::ReturnedValue QQuickJSContext2DImageData::method_get_height(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DImageData::method_get_height(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2DImageData> imageData(scope, ctx->callData->thisObject);
@@ -3122,7 +3122,7 @@ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_height(QV4::SimpleCall
   \qmlproperty object QtQuick::CanvasImageData::data
   Holds the one-dimensional array containing the data in RGBA order, as integers in the range 0 to 255.
  */
-QV4::ReturnedValue QQuickJSContext2DImageData::method_get_data(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DImageData::method_get_data(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2DImageData> imageData(scope, ctx->callData->thisObject);
@@ -3149,7 +3149,7 @@ QV4::ReturnedValue QQuickJSContext2DImageData::method_get_data(QV4::SimpleCallCo
   The length attribute of a CanvasPixelArray object must return this h×w×4 number value.
   This property is read only.
 */
-QV4::ReturnedValue QQuickJSContext2DPixelData::proto_get_length(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPixelData::proto_get_length(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2DPixelData> r(scope, ctx->callData->thisObject.as<QQuickJSContext2DPixelData>());
@@ -3249,7 +3249,7 @@ void QQuickJSContext2DPixelData::putIndexed(QV4::Managed *m, uint index, const Q
     \sa Canvas::loadImage(), QtQuick::Canvas::unloadImage(),
         QtQuick::Canvas::isImageLoaded
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_createImageData(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_createImageData(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject.as<QQuickJSContext2D>());
@@ -3289,7 +3289,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createImageData(QV4::Simpl
   \qmlmethod CanvasImageData QtQuick::Context2D::getImageData(real sx, real sy, real sw, real sh)
   Returns an CanvasImageData object containing the image data for the given rectangle of the canvas.
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_getImageData(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_getImageData(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject.as<QQuickJSContext2D>());
@@ -3317,7 +3317,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_getImageData(QV4::SimpleCa
   \qmlmethod object QtQuick::Context2D::putImageData(CanvasImageData imageData, real dx, real dy, real dirtyX, real dirtyY, real dirtyWidth, real dirtyHeight)
   Paints the data from the given ImageData object onto the canvas. If a dirty rectangle (\a dirtyX, \a dirtyY, \a dirtyWidth, \a dirtyHeight) is provided, only the pixels from that rectangle are painted.
   */
-QV4::ReturnedValue QQuickJSContext2DPrototype::method_putImageData(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickJSContext2DPrototype::method_putImageData(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickJSContext2D> r(scope, ctx->callData->thisObject.as<QQuickJSContext2D>());
@@ -3418,7 +3418,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_putImageData(QV4::SimpleCa
   gradient.addColorStop(0.7, 'rgba(0, 255, 255, 1');
   \endcode
   */
-QV4::ReturnedValue QQuickContext2DStyle::gradient_proto_addColorStop(QV4::SimpleCallContext *ctx)
+QV4::ReturnedValue QQuickContext2DStyle::gradient_proto_addColorStop(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
     QV4::Scoped<QQuickContext2DStyle> style(scope, ctx->callData->thisObject.as<QQuickContext2DStyle>());
diff --git a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
index 27091e55ca..56df3a469a 100644
--- a/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
+++ b/tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
@@ -77,7 +77,7 @@ public:
 
     QV4::ExecutionEngine *v4Engine() { return QV8Engine::getV4(this); }
 
-    typedef QV4::ReturnedValue (*InjectedFunction)(QV4::SimpleCallContext*);
+    typedef QV4::ReturnedValue (*InjectedFunction)(QV4::CallContext*);
 
     Q_INVOKABLE void injectFunction(const QString &functionName, TestEngine::InjectedFunction injectedFunction)
     {
@@ -305,7 +305,7 @@ void tst_qv4debugger::addBreakPointWhilePaused()
     QCOMPARE(state.lineNumber, 2);
 }
 
-static QV4::ReturnedValue someCall(QV4::SimpleCallContext *ctx)
+static QV4::ReturnedValue someCall(QV4::CallContext *ctx)
 {
     ctx->engine->debugger->removeBreakPoint("removeBreakPointForNextInstruction", 2);
     return QV4::Encode::undefined();