Silence some -Wswitch-default warnings.
Merge pull request #1640 from rohit-n/switch-default

Silence some -Wswitch-default warnings.