Cleaning up the types used in mmbuf