Fill tasks now share a flexible common method

Also the amount of forced normalization is reduced to only what's
necessary.