Cleaned up assertions.