Update based on style comments.

Author: gkellogg

lib/context.js

@@ -96,7 +96,8 @@ api.process = ({activeCtx, localCtx, options}) => {
           'Unsupported JSON-LD version: ' + ctx['@version'],
           'jsonld.UnsupportedVersion',
           {code: 'invalid @version value', context: ctx});
-      } else if(activeCtx.processingMode && activeCtx.processingMode.indexOf('json-ld-1.1') !== 0) {
+      }
+      if(activeCtx.processingMode && activeCtx.processingMode.indexOf('json-ld-1.1') !== 0) {
         throw new JsonLdError(
           '@version: ' + ctx['@version'] + ' not compatible with ' + activeCtx.processingMode,
           'jsonld.ProcessingModeConflict',
@@ -107,7 +108,7 @@ api.process = ({activeCtx, localCtx, options}) => {
       defined['@version'] = true;
     }
 
-    // If not set explicitly, set processingMode to "json-ld-1.0"
+    // if not set explicitly, set processingMode to "json-ld-1.0"
     rval.processingMode = rval.processingMode || activeCtx.processingMode || 'json-ld-1.0';
 
     // handle @base
@@ -379,7 +380,7 @@ api.createTermDefinition = (activeCtx, localCtx, term, defined) => {
   }
 
   if('@container' in value) {
-    // Normalize container to an array form
+    // normalize container to an array form
     const container = _isString(value['@container']) ? [value['@container']] : (value['@container'] || []);
     const validContainers = ['@list', '@set', '@index', '@language'];
     let isValid = true;
@@ -393,14 +394,14 @@ api.createTermDefinition = (activeCtx, localCtx, term, defined) => {
       // check container length
       isValid &= container.length <= (hasSet ? 2 : 1);
     } else {
-      // container must be a string which is one of the validContainers
+      // in JSON-LD 1.0, container must not be an array (it must be a string, which is one of the validContainers)
       isValid &= !_isArray(value['@container']);
 
       // check container length
       isValid &= container.length <= 1;
     }
 
-    // Check against valid containers
+    // check against valid containers
     isValid &= container.every(c => validContainers.includes(c));
 
     // @set not allowed with @list