More #if guards for newer APIs.