Revert of 9e5f19f555 best to remove default case

As suggested by Frank Filz, let's keep the ending
return statement and remove the default case.
This is to avoid missing case detection with
strict compile can keep the code honest. We have
had number of bugs happen because someone added
to an enum and didn't add cases to every switch on
that enum.