Integrate changes from The Witness.