Cleaned up a sloppy merge.