Cleaned up after upstream pull.