Removed some now-redundant asserts.
Added one more assertion for size checking.
Removed old include.
Removed old includes.