Clean-up variable declarations.