Comment 15 for bug 1318657

Thanks for the changes.

I made additional changes in rev. 13420.

" I did not convert to a switch statement, as it is one of those instances where {} are needed inside most of the case statements, and it ended up being longer and uglier than the if/else structure."
You should always use {} inside all case statements. I made the change for you and I find it much cleaner than the if/else structure. As a bonus, we get compile-time checks that all type cases are handled.

Also look at the other changes I made. You are new'ing too much (we are not programming in Java! ;).

Please study my changes in rev. 13420.