Simplify wwSprmSearcher further

Change-Id: Ib2d1d7665e5293c126eef5bde6177a88ecd5ce96