Avoid use of deprecated features.