Make the rest of the services have a similar raw/user interface structure.

filter/count/mc.go

Index: filter/count/mc.go
diff --git a/filter/count/mc.go b/filter/count/mc.go
index d65a096c657063f88db745d6012ec26e0053acf5..1000140890092084001d18c9cf2eea496baeaf95 100644
--- a/filter/count/mc.go
+++ b/filter/count/mc.go
@@ -13,18 +13,12 @@ import (
 // MCCounter is the counter object for the Memcache service.
 type MCCounter struct {
 	NewItem             Entry
-	Add                 Entry
-	Set                 Entry
-	Get                 Entry
-	Delete              Entry
-	CompareAndSwap      Entry
 	AddMulti            Entry
 	SetMulti            Entry
 	GetMulti            Entry
 	DeleteMulti         Entry
 	CompareAndSwapMulti Entry
 	Increment           Entry
-	IncrementExisting   Entry
 	Flush               Entry
 	Stats               Entry
 }
@@ -32,53 +26,43 @@ type MCCounter struct {
 type mcCounter struct {
 	c *MCCounter
 
-	mc mc.Interface
+	mc mc.RawInterface
 }
 
-var _ mc.Interface = (*mcCounter)(nil)
+var _ mc.RawInterface = (*mcCounter)(nil)
 
 func (m *mcCounter) NewItem(key string) mc.Item {
 	m.c.NewItem.up()
 	return m.mc.NewItem(key)
 }
 
-func (m *mcCounter) Get(key string) (mc.Item, error) {
-	ret, err := m.mc.Get(key)
-	return ret, m.c.Get.up(err)
+func (m *mcCounter) GetMulti(keys []string, cb mc.RawItemCB) error {
+	return m.c.GetMulti.up(m.mc.GetMulti(keys, cb))
 }
 
-func (m *mcCounter) GetMulti(keys []string) (map[string]mc.Item, error) {
-	ret, err := m.mc.GetMulti(keys)
-	return ret, m.c.GetMulti.up(err)
+func (m *mcCounter) AddMulti(items []mc.Item, cb mc.RawCB) error {
+	return m.c.AddMulti.up(m.mc.AddMulti(items, cb))
 }
 
-func (m *mcCounter) Add(item mc.Item) error  { return m.c.Add.up(m.mc.Add(item)) }
-func (m *mcCounter) Set(item mc.Item) error  { return m.c.Set.up(m.mc.Set(item)) }
-func (m *mcCounter) Delete(key string) error { return m.c.Delete.up(m.mc.Delete(key)) }
-func (m *mcCounter) CompareAndSwap(item mc.Item) error {
-	return m.c.CompareAndSwap.up(m.mc.CompareAndSwap(item))
+func (m *mcCounter) SetMulti(items []mc.Item, cb mc.RawCB) error {
+	return m.c.SetMulti.up(m.mc.SetMulti(items, cb))
 }
-func (m *mcCounter) AddMulti(items []mc.Item) error { return m.c.AddMulti.up(m.mc.AddMulti(items)) }
-func (m *mcCounter) SetMulti(items []mc.Item) error { return m.c.SetMulti.up(m.mc.SetMulti(items)) }
-func (m *mcCounter) DeleteMulti(keys []string) error {
-	return m.c.DeleteMulti.up(m.mc.DeleteMulti(keys))
+
+func (m *mcCounter) DeleteMulti(keys []string, cb mc.RawCB) error {
+	return m.c.DeleteMulti.up(m.mc.DeleteMulti(keys, cb))
 }
-func (m *mcCounter) Flush() error { return m.c.Flush.up(m.mc.Flush()) }
 
-func (m *mcCounter) CompareAndSwapMulti(items []mc.Item) error {
-	return m.c.CompareAndSwapMulti.up(m.mc.CompareAndSwapMulti(items))
+func (m *mcCounter) CompareAndSwapMulti(items []mc.Item, cb mc.RawCB) error {
+	return m.c.CompareAndSwapMulti.up(m.mc.CompareAndSwapMulti(items, cb))
 }
 
-func (m *mcCounter) Increment(key string, delta int64, initialValue uint64) (newValue uint64, err error) {
+func (m *mcCounter) Flush() error { return m.c.Flush.up(m.mc.Flush()) }
+
+func (m *mcCounter) Increment(key string, delta int64, initialValue *uint64) (newValue uint64, err error) {
 	ret, err := m.mc.Increment(key, delta, initialValue)
 	return ret, m.c.Increment.up(err)
 }
 
-func (m *mcCounter) IncrementExisting(key string, delta int64) (newValue uint64, err error) {
-	ret, err := m.mc.IncrementExisting(key, delta)
-	return ret, m.c.IncrementExisting.up(err)
-}
-
 func (m *mcCounter) Stats() (*mc.Statistics, error) {
 	ret, err := m.mc.Stats()
 	return ret, m.c.Stats.up(err)
@@ -87,7 +71,7 @@ func (m *mcCounter) Stats() (*mc.Statistics, error) {
 // FilterMC installs a counter Memcache filter in the context.
 func FilterMC(c context.Context) (context.Context, *MCCounter) {
 	state := &MCCounter{}
-	return mc.AddFilters(c, func(ic context.Context, mc mc.Interface) mc.Interface {
+	return mc.AddRawFilters(c, func(ic context.Context, mc mc.RawInterface) mc.RawInterface {
 		return &mcCounter{state, mc}
 	}), state
 }