Improved assertion failure messages so they read more coherently when
displayed.