Cleaned up unfortunate merge casualties.