Rearrange structures to better fit valgrind's memory leak heuristics.