Do not use which anymore.
Merge pull request #1061 from vbmithr/nowhich

Do not use which anymore.