Add Pair assert, generify some other asserts.