Add/improve expectation messages.