Having the variables in logical groups allows us to easier
#ifdef stuff out.

No functional change.
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>