Pulling in Mark's fixes for memory leaks in memslap