Added missing include for atomic. Cleanup.