Update to use the new stack-allocated stuff