A few syntax changes here and there.