Don't use a separate allocation. Update tests.