Getting rid of hard-coded hostnames as far as possible.