Fix messaging so that the `expect` syntax is used if it is enabled.

Fixes #197.