Make asserts more consistent