Committing Chris' max_age changes.