More cleaning of stack variables.