=== Message

Refactor the code to remove this use of "XXX".

