Add some asserts in Shark Table for unified views, plus some other minor cleanup.