Refactoring: preprocessor symbols extended for cppchecks, resolved some minor issues.