Update messages to include the matched subscription/binding

- Also fixup some jsdoc comments and remove a redundant variable
Fix incorrect reference to a variable