Remove usage of non-portable which
#346
+4
−8
Merged
which
#346