Remove more multiline var declarations.
MOAR VARS
Fix last multiline vars statements in packages.

Searched using the regexp /var.*,\n/
Merge pull request #5370 from cibernox/remove_some_multine_var_declarations

Remove even more multiline var declarations.