Fixed a few unnecessary differences introduced by the merge.