Be more careful not to have asserts in helper code.