Move to a C++/Proto-based scheme.