preproc: Finally drop context-through search