A bunch of syntax changes