Include Mark Story changes

Make getenv a protected instead of private member.