Issue #1013: Added some more "asserts".