Fix variable declaration.
Extended list of things to check.