Type inferences missed by 16

Allow Searcher to compile under jdk 1.6 (generic type inferencing too weak)