Fixing the result of a bad merge.
Fixing old-style vector, and xfail-prettying th contracts test because the pretty printer is unhappy.