A more complete fix for #31588 1. Make "generic" code more readable 2. Clarify HTML or Markdown for the payload content