diff --git a/lib/cpp/Makefile.slee b/lib/cpp/Makefile.slee
deleted file mode 100644
index fde4411..0000000
--- a/lib/cpp/Makefile.slee
+++ /dev/null
@@ -1,91 +0,0 @@
-# Makefile for Thrift C++ library. Generates a shared object that can be
-# installed to /usr/local/lib
-#
-# TODO(mcslee): Add the ability to compile separate statis modules that can
-# be compiled directly into Thrift applications instead of dynamic runtime
-# loading of the full libs
-# 
-# Author:
-#   Mark Slee <mcslee@facebook.com>
-
-target: libthrift.so libconcurrency.so
-
-# Tools
-LD    = g++
-CPP   = g++
-
-CC_COMMON_FLAGS  = -g -c -Wall -Isrc -fPIC -fno-common
-
-LD_COMMON_FLAGS=
-
-LD_APP_FLAGS= $(LD_COMMON_FLAGS)
-
-LD_LIB_FLAGS= -dynamiclib $(LD_COMMON_FLAGS)
-
-# Source files
-SRCS  = src/protocol/TBinaryProtocol.cc \
-	src/transport/TBufferedTransport.cc \
-	src/transport/TChunkedTransport.cc \
-	src/transport/TSocket.cc \
-	src/transport/TServerSocket.cc \
-	src/server/TSimpleServer.cc
-
-# Concurreny Utility Source files
-CONCURRENCY_SRCS  = src/concurrency/Monitor.cc \
-	            src/concurrency/Mutex.cc \
-	            src/concurrency/PosixThreadFactory.cc \
-	            src/concurrency/ThreadManager.cc \
-	            src/concurrency/TimerManager.cc
-
-CONCURRENCY_OBJS  = $(patsubst %.cc,%.o,$(CONCURRENCY_SRCS))
-
-$(CONCURRENCY_OBJS): %.o : %.cc
-	$(CC) $(CC_COMMON_FLAGS) $< -o $@
-
-CONCURRENCY_TEST_SRCS  = src/concurrency/test/TimerManagerTests.cc
-
-CONCURRENCY_TEST_OBJS  = $(patsubst %.cc,%.o,$(CONCURRENCY_TEST_SRCS))
-
-$(CONCURRENCY_TEST_OBJS): %.o : %.cc
-	$(CC) $(CC_COMMON_FLAGS) -I src/concurrency $< -o $@
-
-# Linked libraries
-
-# thrift library
-
-THRIFT_OBJS  = $(patsubst %.cc,%.o, $(SRCS))
-
-$(THRIFT_OBJS): %.o : %.cc
-	$(CC) $(CC_COMMON_FLAGS) $< -o $@
-
-libthrift.so: $(THRIFT_OBJS)
-	 $(LD) -o $@ $(LD_LIB_FLAGS) $(THRIFT_OBJS)
-
-# concurrency util library
-
-libconcurrency.so: $(CONCURRENCY_OBJS)
-	$(LD) -o $@ $(LD_LIB_FLAGS) $(CONCURRENCY_OBJS)
-
-concurrency_tests: libconcurrency.so $(CONCURRENCY_TEST_OBJS)
-	$(LD) -o $@ $(LD_APP_FLAGS) -L. $(CONCURRENCY_TEST_OBJS)  libconcurrency.so
-
-tests: concurrency_tests
-
-clean_libthrift:
-	rm -f libthrift.so
-	rm -f $(THRIFT_OBJS)
-
-clean_libconcurrency:
-	rm -f libconcurrency.so
-	rm -f $(CONCURRENCY_OBJS)
-
-clean_tests:
-	rm -f concurrency_tests
-	rm -f $(CONCURRENTY_TEST_OBJS)
-
-# Clean it up
-clean: clean_libthrift clean_libconcurrency clean_tests
-
-# Install
-install: libthrift
-	sudo install libthrift.so /usr/local/lib
diff --git a/lib/cpp/cleanup.sh b/lib/cpp/cleanup.sh
index d026a46..71151e9 100755
--- a/lib/cpp/cleanup.sh
+++ b/lib/cpp/cleanup.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+make clean 1>/dev/null 2>/dev/null
 rm -rf \
 AUTHORS \
 ChangeLog \
@@ -8,7 +9,6 @@
 Makefile.in \
 Makefile.orig \
 NEWS \
-README \
 aclocal.m4 \
 autom4te.cache \
 autoscan.log \
diff --git a/lib/cpp/configure.ac b/lib/cpp/configure.ac
index 878e55a..9802096 100644
--- a/lib/cpp/configure.ac
+++ b/lib/cpp/configure.ac
@@ -106,4 +106,6 @@
 
 AC_PROG_LIBTOOL
 
+AC_PROG_MAKE_SET
+
 AC_OUTPUT(Makefile)
diff --git a/lib/cpp/src/protocol/TProtocol.h b/lib/cpp/src/protocol/TProtocol.h
index 846a321..8b2e6bd 100644
--- a/lib/cpp/src/protocol/TProtocol.h
+++ b/lib/cpp/src/protocol/TProtocol.h
@@ -71,11 +71,14 @@
  * Abstract class for a thrift protocol driver. These are all the methods that
  * a protocol must implement. Essentially, there must be some way of reading
  * and writing all the base types, plus a mechanism for writing out structs
- * with indexed fields. Also notice that all methods are strictly const. This
- * is by design. Protcol impelementations may NOT keep state, because the
- * same TProtocol object may be used simultaneously by multiple threads. This
- * theoretically introduces some limititations into the possible protocol
- * formats, but with the benefit of performance, clarity, and simplicity.
+ * with indexed fields.
+ *
+ * TProtocol objects should not be shared across multiple encoding contexts,
+ * as they may need to maintain internal state in some protocols (i.e. XML).
+ * Note that is is acceptable for the TProtocol module to do its own internal
+ * buffered reads/writes to the underlying TTransport where appropriate (i.e.
+ * when parsing an input XML stream, reading should be batched rather than
+ * looking ahead character by character for a close tag).
  *
  * @author Mark Slee <mcslee@facebook.com>
  */