White space clean ups from uncrustify.
More shuffling of gld -> ourGlobals and related cleanups.