Merge in namespace fixes for binary protocol.