(Mostly) merge local and cloud logging together.