Make Rule message shape consistent with config files