EPG-35885: simplify asserts