Further rationalise our usage of assert()