diff --git a/src/map.js b/src/map.js
index <HASH>..<HASH> 100644
--- a/src/map.js
+++ b/src/map.js
@@ -1,3 +1,5 @@
+/* global Map */
+
 class ObjectMap {
   constructor(){
     this._obj = {};
@@ -28,6 +30,4 @@ class ObjectMap {
   }
 }
 
-// TODO use the stdlib Map in future...
-// module.exports = typeof Map !== 'undefined' ? Map : ObjectMap;
-module.exports = ObjectMap;
+module.exports = typeof Map !== 'undefined' ? Map : ObjectMap;
diff --git a/src/set.js b/src/set.js
index <HASH>..<HASH> 100644
--- a/src/set.js
+++ b/src/set.js
@@ -61,6 +61,4 @@ class ObjectSet {
   }
 }
 
-// TODO use the stdlib Set in future...
-// module.exports = typeof Set !== undef ? Set : ObjectSet;
-module.exports = ObjectSet;
+module.exports = typeof Set !== undef ? Set : ObjectSet;
Default to stdlib Map and Set where available #<I>