Added ThreadSafeLazy. Cleaned up some merge fail.