Replace DrainFilter with ExtractIf
#341
+49
−148
Merged