Clean up some more assert conditions

... for more readable assert failures