Improve support for pseudo-cluster installs.