Make vendored packages ES3-safe.
Merge pull request #5367 from rwjblue/make-vendored-trees-es3-safe

Make vendored packages ES3-safe.
Merge pull request #5364 from cibernox/remove_some_multine_var_declarations

Remove some multiline var declarations.