And put back a little code duplication, in the form of asserts.