I think we should to the conversion of this function in this patch... so that this conversion is done and the other conversion can use it... then we don't have to redo everyone one but the last one. We just have to remember to remove aggregator_load_feed_items on the last one :)