Still not happy with Search and Remove.

They could be simplified, or at least made to look more elegant.