Cleaning up a few things left over from the merge.