diff --git a/extensions/configuration-editing/src/extension.ts b/extensions/configuration-editing/src/extension.ts
index 41680f1795d..78114b106ba 100644
--- a/extensions/configuration-editing/src/extension.ts
+++ b/extensions/configuration-editing/src/extension.ts
@@ -18,13 +18,7 @@ export function activate(context) {
 		provideCompletionItems(document, position, token) {
 			const location = getLocation(document.getText(), document.offsetAt(position));
 			if (location.path[1] === 'command') {
-				return commands.then(ids => {
-					return ids.map(id => {
-						let item = new vscode.CompletionItem(id);
-						item.kind = vscode.CompletionItemKind.Value;
-						return item;
-					});
-				});
+				return commands.then(ids => ids.map(id => new vscode.CompletionItem(id, vscode.CompletionItemKind.Value)));
 			}
 		}
 	});
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index d0b1c68f7ab..d375205386a 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -717,8 +717,9 @@ export class CompletionItem {
 	insertText: string;
 	textEdit: TextEdit;
 
-	constructor(label: string) {
+	constructor(label: string, kind?: CompletionItemKind) {
 		this.label = label;
+		this.kind = kind;
 	}
 
 	toJSON(): any {