Another pass over the setup scripts.