OK.  I'll try removing all except for the ones where variables are declared in the case statements.