Index: trunk/FACT++/src/InterpreterV8.cc
===================================================================
--- trunk/FACT++/src/InterpreterV8.cc	(revision 14670)
+++ trunk/FACT++/src/InterpreterV8.cc	(revision 14672)
@@ -188,8 +188,8 @@
     }
 
-    Handle<Object> This = args.This();
-
-    This->SetInternalField(0, Integer::New(id));
-    This->Set(String::New("kill"), FunctionTemplate::New(WrapKill)->GetFunction(), ReadOnly);
+    Handle<Object> self = args.This();
+
+    self->SetInternalField(0, Integer::New(id));
+    self->Set(String::New("kill"), FunctionTemplate::New(WrapKill)->GetFunction(), ReadOnly);
 
     return Undefined();
@@ -731,14 +731,14 @@
         fDatabases.push_back(db);
 
-        Handle<Object> This = args.This();
-        This->Set(String::New("user"),     String::New(db->user.c_str()), ReadOnly);
-        This->Set(String::New("server"),   String::New(db->server.c_str()), ReadOnly);
-        This->Set(String::New("database"), String::New(db->db.c_str()), ReadOnly);
-        This->Set(String::New("port"),     db->port==0?Undefined():Integer::NewFromUnsigned(db->port), ReadOnly);
-        This->Set(String::New("query"),    FunctionTemplate::New(WrapDbQuery)->GetFunction(), ReadOnly);
-        This->Set(String::New("close"),    FunctionTemplate::New(WrapDbClose)->GetFunction(),   ReadOnly);
-        This->SetInternalField(0, External::New(db));
-
-        return handle_scope.Close(This);
+        Handle<Object> self = args.This();
+        self->Set(String::New("user"),     String::New(db->user.c_str()), ReadOnly);
+        self->Set(String::New("server"),   String::New(db->server.c_str()), ReadOnly);
+        self->Set(String::New("database"), String::New(db->db.c_str()), ReadOnly);
+        self->Set(String::New("port"),     db->port==0?Undefined():Integer::NewFromUnsigned(db->port), ReadOnly);
+        self->Set(String::New("query"),    FunctionTemplate::New(WrapDbQuery)->GetFunction(), ReadOnly);
+        self->Set(String::New("close"),    FunctionTemplate::New(WrapDbClose)->GetFunction(),   ReadOnly);
+        self->SetInternalField(0, External::New(db));
+
+        return handle_scope.Close(self);
     }
     catch (const exception &e)
@@ -1176,14 +1176,14 @@
     const HandleScope handle_scope;
 
-    Handle<Object> This = args.This();
-    This->Set(String::New("get"),    FunctionTemplate::New(WrapGetData)->GetFunction(),  ReadOnly);
-    This->Set(String::New("close"),  FunctionTemplate::New(WrapClose)->GetFunction(),    ReadOnly);
-    This->Set(String::New("name"),   String::New(*str), ReadOnly);
-    This->Set(String::New("isOpen"), Boolean::New(true));
+    Handle<Object> self = args.This();
+    self->Set(String::New("get"),    FunctionTemplate::New(WrapGetData)->GetFunction(),  ReadOnly);
+    self->Set(String::New("close"),  FunctionTemplate::New(WrapClose)->GetFunction(),    ReadOnly);
+    self->Set(String::New("name"),   String::New(*str), ReadOnly);
+    self->Set(String::New("isOpen"), Boolean::New(true));
 
     if (args.Length()==2)
-        This->Set(String::New("onchange"), args[1]);
-
-    fReverseMap[*str] = Persistent<Object>::New(This);
+        self->Set(String::New("onchange"), args[1]);
+
+    fReverseMap[*str] = Persistent<Object>::New(self);
 
     void *ptr = JsSubscribe(*str);
@@ -1191,5 +1191,5 @@
         return ThrowException(String::New(("Subscription to '"+string(*str)+"' already exists.").c_str()));
 
-    This->SetInternalField(0, External::New(ptr));
+    self->SetInternalField(0, External::New(ptr));
 
     return Undefined();
@@ -1398,11 +1398,11 @@
         return Undefined();
 
-    Handle<Object> This = args.This();
-    This->Set(String::New("ra"),      Number::New(equ.ra/15),  ReadOnly);
-    This->Set(String::New("dec"),     Number::New(equ.dec),    ReadOnly);
-    This->Set(String::New("toLocal"), function,                ReadOnly);
-    This->Set(String::New("time"),    date,                    ReadOnly);
-
-    return handle_scope.Close(This);
+    Handle<Object> self = args.This();
+    self->Set(String::New("ra"),      Number::New(equ.ra/15),  ReadOnly);
+    self->Set(String::New("dec"),     Number::New(equ.dec),    ReadOnly);
+    self->Set(String::New("toLocal"), function,                ReadOnly);
+    self->Set(String::New("time"),    date,                    ReadOnly);
+
+    return handle_scope.Close(self);
 }
 
@@ -1433,12 +1433,12 @@
         return Undefined();
 
-    Handle<Object> This = args.This();
-    This->Set(String::New("ra"),      Number::New(ra),  ReadOnly);
-    This->Set(String::New("dec"),     Number::New(dec), ReadOnly);
-    This->Set(String::New("toLocal"), function,         ReadOnly);
+    Handle<Object> self = args.This();
+    self->Set(String::New("ra"),      Number::New(ra),  ReadOnly);
+    self->Set(String::New("dec"),     Number::New(dec), ReadOnly);
+    self->Set(String::New("toLocal"), function,         ReadOnly);
     if (args.Length()==3)
-        This->Set(String::New("time"), args[2], ReadOnly);
-
-    return handle_scope.Close(This);
+        self->Set(String::New("time"), args[2], ReadOnly);
+
+    return handle_scope.Close(self);
 }
 
@@ -1469,12 +1469,12 @@
         return Undefined();
 
-    Handle<Object> This = args.This();
-    This->Set(String::New("zd"),    Number::New(zd), ReadOnly);
-    This->Set(String::New("az"),    Number::New(az), ReadOnly);
-    This->Set(String::New("toSky"), function,        ReadOnly);
+    Handle<Object> self = args.This();
+    self->Set(String::New("zd"),    Number::New(zd), ReadOnly);
+    self->Set(String::New("az"),    Number::New(az), ReadOnly);
+    self->Set(String::New("toSky"), function,        ReadOnly);
     if (args.Length()==3)
-        This->Set(String::New("time"), args[2], ReadOnly);
-
-    return handle_scope.Close(This);
+        self->Set(String::New("time"), args[2], ReadOnly);
+
+    return handle_scope.Close(self);
 }
 #endif