Cleanup of finders with :conditions option.
Authored by: jplang 2013-06-12
Parent: [r11962]
Child: [r11964]