Change exception object to AssertionError.
Various other changes.