Refactor when value vs payload is included in diagnostic response.