Fix reordering problems, again

Ended up with OrderedGlobalDeclarations as a last resort