Cleaned up performance warnings a bit.