Modified how variable declarations are managed.