Add additional asserts, and remove some printlns.