Syntax errors of big refactoring removed.
Added AddExceptionSuffix.py
Added AddExceptionSuffix.py
More cleanup after refactoring.