Replace drain() and drain_filter() with extract_if() and extract_from_if()

Replace drain() and drain_filter() with extract_if() and extract_from_if() #1246