Remove CLIENT_SYNTAX and Rename SERVER_SYNTAX to EXTRA_SYNTAX