Additional mount check and tidier GetPreferredLocalStorePath code.