Ok, let's keep it as-is, and get back to it when we move to pbufs.