Code reorganization that allows the code to make best use of gccgo.