Add support for master/remote modes to settings code.