join declaration and first use for lots of variables
Merge pull request #1758 from braddr/cleanup2

join declaration and first use for lots of variables