More changes to get rid of initializations.