More changes to memory footprint.