Removing unnecessary control flow nestings
Adding defaults to switches that mixed them.

This is mostly to eliminate compiler warnings. Mind you, those warnings
sort-of have a point; if we'd ever extend the enum, this'll catch the issue.
Adding more strict Eclipse compiler warning settings.