diff --git a/plugins/pilot/lib/commands/settings.js b/plugins/pilot/lib/commands/settings.js
index cfc5edd1..e336fb97 100644
--- a/plugins/pilot/lib/commands/settings.js
+++ b/plugins/pilot/lib/commands/settings.js
@@ -37,57 +37,18 @@
 
 define(function(require, exports, module) {
 
-/**
- * Something of a hack to allow the set command to give a clearer definition
- * of the type to the command line.
- */
-var valueDeferredType = {
-    name: "deferred",
-    undeferType: function(typeSpec, env) {
-        var assignments = typeSpec.assignments;
-        var replacement = 'text';
-
-        if (assignments) {
-            // Find the assignment for 'setting' so we can get it's value
-            var settingAssignment = null;
-            assignments.forEach(function(assignment) {
-                if (assignment.param.name === 'setting') {
-                    settingAssignment = assignment;
-                }
-            });
-
-            if (settingAssignment) {
-                var settingName = settingAssignment.value;
-                if (settingName && settingName !== '') {
-                    var settingExt = settings[settingName];
-                    if (settingExt) {
-                        replacement = settingExt.type;
-                    }
-                }
-            }
-        }
-
-        return replacement;
-    }
-};
-
 var setCommandSpec = {
     name: "set",
     params: [
         {
             name: "setting",
-            type: {
-                name: "selection",
-                getOptions: function(env) {
-                    return env.settings.getSettingNames();
-                }
-            },
+            type: "setting",
             description: "The name of the setting to display or alter",
             defaultValue: null
         },
         {
             name: "value",
-            type: valueDeferredType,
+            type: "settingValue",
             description: "The new value for the chosen setting",
             defaultValue: null
         }
@@ -139,10 +100,7 @@ var unsetCommandSpec = {
     params: [
         {
             name: "setting",
-            type: {
-                name: "selection",
-                pointer: "settings:index#getSettings"
-            },
+            type: "setting",
             description: "The name of the setting to return to defaults"
         }
     ],
diff --git a/plugins/pilot/lib/event_emitter.js b/plugins/pilot/lib/event_emitter.js
index a458dd43..c7ddf1cd 100644
--- a/plugins/pilot/lib/event_emitter.js
+++ b/plugins/pilot/lib/event_emitter.js
@@ -37,7 +37,7 @@
 
 define(function(require, exports, module) {
 
-var lang = require("pilot/lang").lang;
+var lang = require('pilot/lang').lang;
 
 var EventEmitter = {};