Add indirection to PATH saving