Remove redundant generic type declarations; it's 2013.
Being a little bit more pedantic with switch statement defaults.