Clean up callback interface code and template

Source/bindings/templates/callback_interface.cpp

Index: Source/bindings/templates/callback_interface.cpp
diff --git a/Source/bindings/templates/callback_interface.cpp b/Source/bindings/templates/callback_interface.cpp
index dbdf66cca61f8dacd05fdb8d20395aef852b4b0a..5199616ddb77498db33ffb0182062adda40c3a7c 100644
--- a/Source/bindings/templates/callback_interface.cpp
+++ b/Source/bindings/templates/callback_interface.cpp
@@ -51,15 +51,15 @@ namespace WebCore {
     ASSERT(thisHandle->IsObject());
     {% endif %}
     {% for argument in method.arguments %}
-    {{argument.cpp_to_v8_conversion | indent}}
-    if ({{argument.name}}Handle.IsEmpty()) {
+    v8::Handle<v8::Value> {{argument.handle}} = {{argument.cpp_value_to_v8_value}};
+    if ({{argument.handle}}.IsEmpty()) {
         if (!isScriptControllerTerminating())
             CRASH();
         {{return_default}};
     }
     {% endfor %}
     {% if method.arguments %}
-    v8::Handle<v8::Value> argv[] = { {{method.handles | join(', ')}} };
+    v8::Handle<v8::Value> argv[] = { {{method.arguments | join(', ', attribute='handle')}} };
     {% else %}
     v8::Handle<v8::Value> *argv = 0;
     {% endif %}