Revert "Add a default section to a switch-statement"
    
    This reverts commit d698499602461b98fd56f2d550f80c6cb25f12a9.
    
    And adds the correct fix.
    Also makes the function static,as it is used nowehere else.