Fixing up after proving that the examples can work.