Add SDF syntax for SwitchStmt and DoStmt, while keeping the old syntax at the same time