Clean up variable declarations.