Update for language changes

r? @AngryLawyer (or whoever)