Prepare for upcoming language changes