- Avoid const_cast in testsimplifytokens.cpp - Removed redundant null-check (VS11 code analysis) - Fixed MSVC compiler warning - Replaced some indentation counters