Improve asserts.