Finish refactoring, but the same test, p7, still fails\!  Now on C compilation.