Use paths in isolate() and stub out expand()