This is the kind of change that I would prefer to not do when adding sanity code.  The message format should remain compatible with existing interface clients for testing purposes.  The ChatMessage cruft becomes fair game after this PR is merged.