Added some more assertions.