Move warning-avoidance code to be C89-compatible