indentation of switch/case blocks is still wrong

switch statements are not auto-indented correctly for the "Exclude Braces" style:

switch(x)
{
case 1:
  break;
case 2:
  break;
}

This is clearly wrong; everything between the braces should be indented one level.

It should be like this:

switch(x)
{
  case 1:
    break;
  case 2:
    break;
}

And for the "Include Braces" style, it's also wrong; in this case the statements in a case block are not indented from the case label itself:

switch(x)
  {
  case 1:
  break;  
  case 2:
  break;
  }