Fix comments.
Fix assertion messages.
Rename error assertion.