Various syntax changes.