Cleaned up #2 a bit.