Cleaned up some leftover messiness after merge.