Restructuring tools/common to remove static initialization