Update format_syntax for the latest changes