Updates for (hopefully) an easier merge.