Several variable declaration changes.