Format tweaks, spurious globals removal.