update syntaxes for switch statements and more