Removed some more assertions.