Improve assertions.