Fix some missing default cases and possible fall-through issues.
These belong better in SkillTools than Misc