Fix regressions for ClassToTemplateMapper replacements

Regressions can be found in https://github.com/saltybeagle/Savvy/commit/9efe7a6944ad531630faf45fc16d82299363bc58
Which are sadly, my fault.
Merge pull request #3 from mfairchild365/mapper-regressions

Fix regressions for ClassToTemplateMapper replacements