From a70c21116ae888ed016565643f254440b31ff0d2 Mon Sep 17 00:00:00 2001
From: Chris Masone <cmasone@atticlabs.io>
Date: Wed, 16 Dec 2015 15:57:17 -0800
Subject: [PATCH] Some compound{Set,Map} cleanup

Remove a bad comment, one-line a few things in Filter()
---
 types/compound_map.go | 4 +---
 types/compound_set.go | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/compound_map.go b/types/compound_map.go
index 0958e48092..b55b497f96 100644
--- a/types/compound_map.go
+++ b/types/compound_map.go
@@ -124,15 +124,13 @@ func (cm compoundMap) IterAllP(concurrency int, f mapIterAllCallback) {
 func (cm compoundMap) Filter(cb mapFilterCallback) Map {
 	seq := newEmptySequenceChunker(makeMapLeafChunkFn(cm.t, cm.cs), newMapMetaSequenceChunkFn(cm.t, cm.cs), newMapLeafBoundaryChecker(), newOrderedMetaSequenceBoundaryChecker)
 
-	// Could conceivably use IterAllP() here.
 	cm.IterAll(func(k, v Value) {
 		if cb(k, v) {
 			seq.Append(mapEntry{k, v})
 		}
 	})
 
-	m := seq.Done()
-	return internalValueFromType(m, m.Type()).(Map)
+	return internalValueFromType(seq.Done(), cm.Type()).(Map)
 }
 
 func (cm compoundMap) Has(key Value) bool {
diff --git a/types/compound_set.go b/types/compound_set.go
index 03a9c154da..f3bac60984 100644
--- a/types/compound_set.go
+++ b/types/compound_set.go
@@ -121,8 +121,7 @@ func (cs compoundSet) Filter(cb setFilterCallback) Set {
 		}
 	})
 
-	s := seq.Done()
-	return internalValueFromType(s, s.Type()).(Set)
+	return internalValueFromType(seq.Done(), cs.Type()).(Set)
 }
 
 func (cs compoundSet) findLeaf(key Value) (*sequenceCursor, setLeaf, int) {