Cleaned up for merge.