Get rid of more assertions