Comment suggestion from Mark
Fix all Preprocessor unit tests
Cast-change suggestion from Mark
Typo fix suggestion from Mark