Modifies to use util/which [GH-654]