Don't unmount the Nix store when doing a curing reinstall, plus other nits and cleanup

Don't unmount the Nix store when doing a curing reinstall, plus other nits and cleanup #1754