Throw out vmem_* altogether, fix #define's.