diff --git a/Source/DoxygenTranslator/src/DoxygenParser.cpp b/Source/DoxygenTranslator/src/DoxygenParser.cpp
index ba8882404..dce394798 100644
--- a/Source/DoxygenTranslator/src/DoxygenParser.cpp
+++ b/Source/DoxygenTranslator/src/DoxygenParser.cpp
@@ -128,7 +128,8 @@ void DoxygenParser::printTree(const DoxygenEntityList &rootList)
   }
 }
 
-int DoxygenParser::commandBelongs(const std::string &theCommand)
+DoxygenParser::DoxyCommandEnum
+DoxygenParser::commandBelongs(const std::string &theCommand)
 {
   DoxyCommandsMapIt it = doxygenCommands.find(stringToLower(theCommand));
 
@@ -1046,6 +1047,13 @@ int DoxygenParser::addCommand(const std::string &commandString,
     return addCommandHtmlEntity(theCommand, tokList, doxyList);
   case COMMAND_IGNORE:
     return ignoreCommand(commandString, tokList, doxyList);
+  case NONE:
+  case END_LINE:
+  case PARAGRAPH_END:
+  case PLAINSTRING:
+  case COMMAND:
+    // TODO: Ensure that these values either are correctly ignored here or can't happen.
+    break;
   }
   return 0;
 }
diff --git a/Source/DoxygenTranslator/src/DoxygenParser.h b/Source/DoxygenTranslator/src/DoxygenParser.h
index bbb519092..753b996d8 100644
--- a/Source/DoxygenTranslator/src/DoxygenParser.h
+++ b/Source/DoxygenTranslator/src/DoxygenParser.h
@@ -130,7 +130,7 @@ private:
    * Determines how a command should be handled (what group it belongs to
    * for parsing rules
    */
-  int commandBelongs(const std::string &theCommand);
+  DoxyCommandEnum commandBelongs(const std::string &theCommand);
 
   /*
    *prints the parse tree