BTW, to clarify the example spec I gave above -- my intention wasn't that it replace the one you have but rather than it supplement it.  It doesn't check the message at all because it's focused only on the call site and it assumes you have another one that checks the message.