NEW_GEN: Yet more fixes for the re-reversing of the matrix sizes.