Reorganization of fill_generic.