Some miscellaneous syntax changes.