Okay, syntax improvements to the 'switch' block.