I think the gain in readability is worth it. Also, this implementation fixes the bug for being able to call `error_message` with the payload in the file `4000-completion-code.xml`.