Out of curiosity, why is this replacement part of this pull request? I'm not opposed to it -- it looks like a nice cleanup -- but it seems unrelated to the ProjectSearcher changes.