Simplify assertions a bit