Condense global variable declarations to lists

Shrink the line count by moving the declarations of global variables
into declaration lists and removing whitespace.