Adapts language handling to modified core