This helps to improve code coverage. Note that most of the changes in this patch are just de-denting the cases of the switch statements.
