--- a/playground/jsonld.js	Tue May 08 14:58:32 2012 -0400
+++ b/playground/jsonld.js	Tue May 08 15:53:33 2012 -0400
@@ -1004,6 +1004,12 @@
   if(_isObject(element)) {
     // element is a @value
     if(_isValue(element)) {
+      // if @value is the only key, return its value
+      if(Object.keys(element).length === 1) {
+        return element['@value'];
+      }
+
+      // get type and language context rules
       var type = jsonld.getContextValue(ctx, property, '@type');
       var language = jsonld.getContextValue(ctx, property, '@language');
 
@@ -1011,17 +1017,6 @@
       if(type !== null &&
         ('@type' in element) && element['@type'] === type) {
         element = element['@value'];
-
-        // use native datatypes for certain xsd types
-        if(type === XSD_BOOLEAN) {
-          element = !(element === 'false' || element === '0');
-        }
-        else if(type === XSD_INTEGER) {
-          element = parseInt(element);
-        }
-        else if(type === XSD_DOUBLE) {
-          element = parseFloat(element);
-        }
       }
       // matching @language specified in context, compact element
       else if(language !== null &&
@@ -1225,9 +1220,9 @@
           'jsonld.SyntaxError', {value: value});
       }
 
-      // recurse into @list, @set, or @graph, keeping the active property
+      // recurse into @list or @set keeping the active property
       var isList = (prop === '@list');
-      if(isList || prop === '@set' || prop === '@graph') {
+      if(isList || prop === '@set') {
         value = this.expand(ctx, property, value, options, isList);
         if(isList && _isList(value)) {
           throw new JsonLdError(
@@ -1299,10 +1294,6 @@
           'containing "@value" must be a string.',
           'jsonld.SyntaxError', {element: rval});
       }
-      // return only the value of @value if there is no @type or @language
-      else if(count === 1) {
-        rval = rval['@value'];
-      }
       // drop null @values
       else if(rval['@value'] === null) {
         rval = null;
@@ -1792,6 +1783,11 @@
  * @return the expanded value.
  */
 function _expandValue(ctx, property, value, base) {
+  // nothing to expand
+  if(value === null) {
+    return null;
+  }
+
   // default to simple string return value
   var rval = value;
 
@@ -1811,15 +1807,19 @@
     if(type === '@id' || prop === '@graph') {
       rval = {'@id': _expandTerm(ctx, value, base)};
     }
-    // other type
-    else if(type !== null) {
-      rval = {'@value': String(value), '@type': type};
-    }
-    // check for language tagging
-    else {
-      var language = jsonld.getContextValue(ctx, property, '@language');
-      if(language !== null) {
-        rval = {'@value': String(value), '@language': language};
+    else if(!_isKeyword(prop)) {
+      rval = {'@value': value};
+
+      // other type
+      if(type !== null) {
+        rval['@type'] = type;
+      }
+      // check for language tagging
+      else {
+        var language = jsonld.getContextValue(ctx, property, '@language');
+        if(language !== null) {
+          rval['@language'] = language;
+        }
       }
     }
   }
@@ -1842,14 +1842,34 @@
   if(_isObject(element)) {
     // convert @value to object
     if(_isValue(element)) {
+      var value = element['@value'];
+      var datatype = element['@type'] || null;
+      if(_isBoolean(value) || _isNumber(value)) {
+        // convert to XSD datatype
+        if(_isBoolean(value)) {
+          value = String(value);
+          datatype = datatype || XSD_BOOLEAN;
+        }
+        else if(_isDouble(value)) {
+          // printf('%1.15e') equivalent
+          value = value.toExponential(15).replace(
+            /(e(?:\+|-))([0-9])$/, '$10$2');
+          datatype = datatype || XSD_DOUBLE;
+        }
+        else {
+          value = String(value);
+          datatype = datatype || XSD_INTEGER;
+        }
+      }
+
       var object = {
-        nominalValue: element['@value'],
+        nominalValue: value,
         interfaceName: 'LiteralNode'
       };
 
-      if('@type' in element) {
+      if(datatype !== null) {
         object.datatype = {
-          nominalValue: element['@type'],
+          nominalValue: datatype,
           interfaceName: 'IRI'
         };
       }
@@ -1946,6 +1966,7 @@
     return;
   }
 
+  // element must be an IRI (@values covered above)
   if(_isString(element)) {
     // property can be null for string subject references in @graph
     if(property === null) {
@@ -1957,44 +1978,7 @@
       property: _clone(property),
       object: {
         nominalValue: element,
-        interfaceName: ((property.nominalValue === RDF_TYPE) ?
-          'IRI' : 'LiteralNode')
-      }
-    };
-    if(graph !== null) {
-      statement.name = graph;
-    }
-    return callback(null, statement);
-  }
-
-  if(_isBoolean(element) || _isNumber(element)) {
-    // convert to XSD datatype
-    if(_isBoolean(element)) {
-      var datatype = XSD_BOOLEAN;
-      var value = String(element);
-    }
-    else if(_isDouble(element)) {
-      var datatype = XSD_DOUBLE;
-      // printf('%1.15e') equivalent
-      var value = element.toExponential(15).replace(
-        /(e(?:\+|-))([0-9])$/, '$10$2');
-    }
-    else {
-      var datatype = XSD_INTEGER;
-      var value = String(element);
-    }
-
-    // emit typed literal
-    var statement = {
-      subject: _clone(subject),
-      property: _clone(property),
-      object: {
-        nominalValue: value,
-        interfaceName: 'LiteralNode',
-        datatype: {
-          nominalValue: datatype,
-          interfaceName: 'IRI'
-        }
+        interfaceName: 'IRI'
       }
     };
     if(graph !== null) {
@@ -2027,6 +2011,18 @@
 
   // add datatype
   if('datatype' in o) {
+    /*
+    var type = o.datatype.nominalValue;
+    // use native datatypes for certain xsd types
+    if(type === XSD_BOOLEAN) {
+      rval = !(rval['@value'] === 'false' || rval['@value'] === '0');
+    }
+    else if(type === XSD_INTEGER) {
+      rval = parseInt(rval['@value']);
+    }
+    else if(type === XSD_DOUBLE) {
+      rval = parseFloat(rval['@value']);
+    }*/
     rval['@type'] = o.datatype.nominalValue;
   }
   // add language
@@ -2837,38 +2833,15 @@
     return sum;
   }
 
-  // rank boolean or number
-  if(_isBoolean(value) || _isNumber(value)) {
-    var type;
-    if(_isBoolean(value)) {
-      type = XSD_BOOLEAN;
-    }
-    else if(_isDouble(value)) {
-      type = XSD_DOUBLE;
-    }
-    else {
-      type = XSD_INTEGER;
-    }
-    if(entry['@type'] === type) {
-      return 3;
+  // Note: Value must be an object that is a @value or subject/reference.
+
+  if(_isValue(value)) {
+    // rank non-string value
+    if(!_isString(value['@value'])) {
+      return (!hasType && !hasLanguage) ? 2 : 1;
     }
-    return (!hasType && !hasLanguage) ? 2 : 1;
-  }
-
-  // rank string (this means the value has no @language)
-  if(_isString(value)) {
-    // entry @language is specifically null or no @type, @language, or default
-    if(entry['@language'] === null ||
-      (!hasType && !hasLanguage && !hasDefaultLanguage)) {
-      return 3;
-    }
-    return 0;
-  }
-
-  // Note: Value must be an object that is a @value or subject/reference.
-
-  // @value must have either @type or @language
-  if(_isValue(value)) {
+
+    // value has a @type
     if('@type' in value) {
       // @types match
       if(value['@type'] === entry['@type']) {
@@ -2877,6 +2850,17 @@
       return (!hasType && !hasLanguage) ? 1 : 0;
     }
 
+    // value has no @type or @language
+    if(!('@language' in value)) {
+      // entry @language is specifically null or no @type, @language, or
+      // default
+      if(entry['@language'] === null ||
+        (!hasType && !hasLanguage && !hasDefaultLanguage)) {
+        return 3;
+      }
+      return 0;
+    }
+
     // @languages match or entry has no @type or @language but default
     // @language matches
     if((value['@language'] === entry['@language']) ||