Make assertions stronger
Remove NullTypes