more conversions to AssertionError and move a comment into an exception message.