Quote path args which may contain spaces, and fix unidiomatic if