When you re-submit this, do you mind changing the indenting / code formatting to use the same style as the other switch statements in this file?  Other than that looks good to me.