Minor corrections in error message phrasings and comments.