diff --git a/src/checkmanager.cpp b/src/checkmanager.cpp
index eae5bed..bb5c267 100644
--- a/src/checkmanager.cpp
+++ b/src/checkmanager.cpp
@@ -1,319 +1,319 @@
 /*
     This file is part of the clazy static checker.
 
     Copyright (C) 2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
     Author: Sérgio Martins <sergio.martins@kdab.com>
 
     Copyright (C) 2015 Sergio Martins <smartins@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #include "checkmanager.h"
 #include "clazy_stl.h"
 #include "ClazyContext.h"
 #include "Checks.h"
 
 #include <llvm/Support/raw_ostream.h>
 
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
 #include <algorithm>
 #include <iterator>
 #include <memory>
 
 using namespace clang;
 using namespace std;
 
 static const char * s_fixitNamePrefix = "fix-";
 static const char * s_levelPrefix = "level";
 
 std::mutex CheckManager::m_lock;
 
 CheckManager::CheckManager()
 {
     m_registeredChecks.reserve(100);
     registerChecks();
 }
 
 bool CheckManager::checkExists(const string &name) const
 {
     return checkForName(m_registeredChecks, name) != m_registeredChecks.cend();
 }
 
 CheckManager *CheckManager::instance()
 {
     static CheckManager s_instance;
     return &s_instance;
 }
 
 void CheckManager::registerCheck(const RegisteredCheck &check)
 {
     m_registeredChecks.push_back(check);
 }
 
 void CheckManager::registerFixIt(int id, const string &fixitName, const string &checkName)
 {
     if (!clazy::startsWith(fixitName, s_fixitNamePrefix)) {
         assert(false);
         return;
     }
 
     auto &fixits = m_fixitsByCheckName[checkName];
     for (const auto& fixit : fixits) {
         if (fixit.name == fixitName) {
             // It can't exist
             assert(false);
             return;
         }
     }
     RegisteredFixIt fixit = {id, fixitName};
     fixits.push_back(fixit);
     m_fixitByName.insert({fixitName, fixit});
 }
 
 CheckBase* CheckManager::createCheck(const string &name, ClazyContext *context)
 {
     for (const auto& rc : m_registeredChecks) {
         if (rc.name == name) {
             return rc.factory(context);
         }
     }
 
     llvm::errs() << "Invalid check name " << name << "\n";
     return nullptr;
 }
 
 string CheckManager::checkNameForFixIt(const string &fixitName) const
 {
     if (fixitName.empty())
         return {};
 
     for (auto &registeredCheck : m_registeredChecks) {
         auto it = m_fixitsByCheckName.find(registeredCheck.name);
         if (it != m_fixitsByCheckName.end()) {
             auto &fixits = (*it).second;
             for (const RegisteredFixIt &fixit : fixits) {
                 if (fixit.name == fixitName)
                     return (*it).first;
             }
         }
     }
 
     return {};
 }
 
 RegisteredCheck::List CheckManager::availableChecks(CheckLevel maxLevel) const
 {
     RegisteredCheck::List checks = m_registeredChecks;
 
     checks.erase(remove_if(checks.begin(), checks.end(),
                            [maxLevel](const RegisteredCheck &r) { return r.level > maxLevel; }), checks.end());
 
 
     return checks;
 }
 
-RegisteredCheck::List CheckManager::requestedChecksThroughEnv(const ClazyContext *context, vector<string> &userDisabledChecks) const
+RegisteredCheck::List CheckManager::requestedChecksThroughEnv(vector<string> &userDisabledChecks) const
 {
     static RegisteredCheck::List requestedChecksThroughEnv;
     static vector<string> disabledChecksThroughEnv;
     if (requestedChecksThroughEnv.empty()) {
         const char *checksEnv = getenv("CLAZY_CHECKS");
         if (checksEnv) {
             const string checksEnvStr = clazy::unquoteString(checksEnv);
             requestedChecksThroughEnv = checksEnvStr == "all_checks" ? availableChecks(CheckLevel2)
                                                                      : checksForCommaSeparatedString(checksEnvStr, /*by-ref=*/ disabledChecksThroughEnv);
         }
     }
 
     std::copy(disabledChecksThroughEnv.begin(), disabledChecksThroughEnv.end(),
               std::back_inserter(userDisabledChecks));
     return requestedChecksThroughEnv;
 }
 
 RegisteredCheck::List::const_iterator CheckManager::checkForName(const RegisteredCheck::List &checks,
                                                                  const string &name) const
 {
     return clazy::find_if(checks, [name](const RegisteredCheck &r) {
         return r.name == name;
     } );
 }
 
 RegisteredFixIt::List CheckManager::availableFixIts(const string &checkName) const
 {
     auto it = m_fixitsByCheckName.find(checkName);
     return it == m_fixitsByCheckName.end() ? RegisteredFixIt::List() : (*it).second;
 }
 
 static bool takeArgument(const string &arg, vector<string> &args)
 {
     auto it = clazy::find(args, arg);
     if (it != args.end()) {
         args.erase(it, it + 1);
         return true;
     }
 
     return false;
 }
 
 RegisteredCheck::List CheckManager::requestedChecks(const ClazyContext *context, std::vector<std::string> &args)
 {
     RegisteredCheck::List result;
 
     // #1 Check if a level was specified
     static const vector<string> levels = { "level0", "level1", "level2" };
     const int numLevels = levels.size();
     CheckLevel requestedLevel = CheckLevelUndefined;
     for (int i = 0; i < numLevels; ++i) {
         if (takeArgument(levels.at(i), args)) {
             requestedLevel = static_cast<CheckLevel>(i);
             break;
         }
     }
 
     if (args.size() > 1) // we only expect a level and a comma separated list of arguments
         return {};
 
     if (args.size() == 1) {
         // #2 Process list of comma separated checks that were passed to compiler
         result = checksForCommaSeparatedString(args[0]);
         if (result.empty()) // User passed inexisting checks.
             return {};
     }
 
     // #3 Append checks specified from env variable
 
     vector<string> userDisabledChecks;
-    RegisteredCheck::List checksFromEnv = requestedChecksThroughEnv(context, /*by-ref*/ userDisabledChecks);
+    RegisteredCheck::List checksFromEnv = requestedChecksThroughEnv(/*by-ref*/ userDisabledChecks);
     copy(checksFromEnv.cbegin(), checksFromEnv.cend(), back_inserter(result));
 
     if (result.empty() && requestedLevel == CheckLevelUndefined) {
         // No checks or level specified, lets use the default level
         requestedLevel = DefaultCheckLevel;
     }
 
     // #4 Add checks from requested level
     RegisteredCheck::List checksFromRequestedLevel = checksForLevel(requestedLevel);
     clazy::append(checksFromRequestedLevel, result);
     clazy::sort_and_remove_dups(result, checkLessThan);
     CheckManager::removeChecksFromList(result, userDisabledChecks);
 
     if (context->options & ClazyContext::ClazyOption_Qt4Compat) {
         // #5 Remove Qt4 incompatible checks
         result.erase(remove_if(result.begin(), result.end(), [](const RegisteredCheck &c){
             return c.options & RegisteredCheck::Option_Qt4Incompatible;
         }), result.end());
     }
 
     return result;
 }
 
 RegisteredCheck::List CheckManager::checksForLevel(int level) const
 {
     RegisteredCheck::List result;
     if (level > CheckLevelUndefined && level <= MaxCheckLevel) {
         clazy::append_if(m_registeredChecks, result, [level](const RegisteredCheck &r) {
             return r.level <= level;
         });
     }
 
     return result;
 }
 
 std::vector<std::pair<CheckBase*, RegisteredCheck>> CheckManager::createChecks(const RegisteredCheck::List &requestedChecks,
                                                                                ClazyContext *context)
 {
     assert(context);
 
     std::vector<std::pair<CheckBase*, RegisteredCheck>> checks;
     checks.reserve(requestedChecks.size() + 1);
     for (const auto& check : requestedChecks) {
         checks.push_back({createCheck(check.name, context), check });
     }
 
     return checks;
 }
 
 /*static */
 void CheckManager::removeChecksFromList(RegisteredCheck::List &list, vector<string> &checkNames)
 {
     for (auto &name : checkNames) {
         list.erase(remove_if(list.begin(), list.end(), [name](const RegisteredCheck &c) {
             return c.name == name;
         }), list.end());
     }
 }
 
 RegisteredCheck::List CheckManager::checksForCommaSeparatedString(const string &str) const
 {
     vector<string> byRefDummy;
     return checksForCommaSeparatedString(str, byRefDummy);
 }
 
 RegisteredCheck::List CheckManager::checksForCommaSeparatedString(const string &str,
                                                                   vector<string> &userDisabledChecks) const
 {
     vector<string> checkNames = clazy::splitString(str, ',');
     RegisteredCheck::List result;
 
     for (const string &name : checkNames) {
         if (checkForName(result, name) != result.cend())
             continue; // Already added. Duplicate check specified. continue.
 
         auto it = checkForName(m_registeredChecks, name);
         if (it == m_registeredChecks.cend()) {
             // Unknown, but might be a fixit name
             const string checkName = checkNameForFixIt(name);
             auto it = checkForName(m_registeredChecks, checkName);
             const bool checkDoesntExist = it == m_registeredChecks.cend();
             if (checkDoesntExist) {
                 if (clazy::startsWith(name, s_levelPrefix) && name.size() == strlen(s_levelPrefix) + 1) {
                     auto lastChar = name.back();
                     const int digit = lastChar - '0';
                     if (digit > CheckLevelUndefined && digit <= MaxCheckLevel) {
                         RegisteredCheck::List levelChecks = checksForLevel(digit);
                         clazy::append(levelChecks, result);
                     } else {
                         llvm::errs() << "Invalid level: " << name << "\n";
                     }
                 } else {
                     if (clazy::startsWith(name, "no-")) {
                         string checkName = name;
                         checkName.erase(0, 3);
                         if (checkExists(checkName)) {
                             userDisabledChecks.push_back(checkName);
                         } else {
                             llvm::errs() << "Invalid check to disable: " << name << "\n";
                         }
                     } else {
                         llvm::errs() << "Invalid check: " << name << "\n";
                     }
                 }
             } else {
                 result.push_back(*it);
             }
             continue;
         } else {
             result.push_back(*it);
         }
     }
 
     removeChecksFromList(result, userDisabledChecks);
 
     return result;
 }
diff --git a/src/checkmanager.h b/src/checkmanager.h
index 3ee7a96..ffa5493 100644
--- a/src/checkmanager.h
+++ b/src/checkmanager.h
@@ -1,129 +1,129 @@
 /*
     This file is part of the clazy static checker.
 
     Copyright (C) 2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
     Author: Sérgio Martins <sergio.martins@kdab.com>
 
     Copyright (C) 2015-2016 Sergio Martins <smartins@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #ifndef CLANG_LAZY_CHECK_MANAGER_H
 #define CLANG_LAZY_CHECK_MANAGER_H
 
 #include "checkbase.h"
 
 #include <clang/Lex/PreprocessorOptions.h>
 
 #include <functional>
 #include <mutex>
 #include <unordered_map>
 #include <vector>
 #include <utility>
 #include <string>
 
 class ClazyContext;
 
 struct RegisteredFixIt {
     typedef std::vector<RegisteredFixIt> List;
     RegisteredFixIt() : id(-1) {}
     RegisteredFixIt(int id, const std::string &name) : id(id), name(name) {}
     int id = -1;
     std::string name;
     bool operator==(const RegisteredFixIt &other) const { return id == other.id; }
 };
 
 using FactoryFunction = std::function<CheckBase*(ClazyContext *context)>;
 
 struct RegisteredCheck {
     enum Option {
         Option_None = 0,
         Option_Qt4Incompatible = 1,
         Option_VisitsStmts = 2,
         Option_VisitsDecls = 4
     };
 
     typedef std::vector<RegisteredCheck> List;
     typedef int Options;
 
     std::string name;
     CheckLevel level;
     FactoryFunction factory;
     Options options;
     bool operator==(const RegisteredCheck &other) const { return name == other.name; }
 };
 
 inline bool checkLessThan(const RegisteredCheck &c1, const RegisteredCheck &c2)
 {
     return c1.name < c2.name;
 }
 
 inline bool checkLessThanByLevel(const RegisteredCheck &c1, const RegisteredCheck &c2)
 {
     if (c1.level == c2.level)
         return checkLessThan(c1, c2);
 
     return c1.level < c2.level;
 }
 
 class CheckManager
 {
 public:
     /**
      * @note You must hold the CheckManager lock when operating on the instance
      *
      * @sa lock()
      */
     static CheckManager *instance();
 
     static std::mutex &lock() { return m_lock; }
     RegisteredCheck::List availableChecks(CheckLevel maxLevel) const;
-    RegisteredCheck::List requestedChecksThroughEnv(const ClazyContext *context, std::vector<std::string> &userDisabledChecks) const;
+    RegisteredCheck::List requestedChecksThroughEnv(std::vector<std::string> &userDisabledChecks) const;
 
     RegisteredCheck::List::const_iterator checkForName(const RegisteredCheck::List &checks, const std::string &name) const;
     RegisteredCheck::List checksForCommaSeparatedString(const std::string &str) const;
     RegisteredCheck::List checksForCommaSeparatedString(const std::string &str,
                                                         std::vector<std::string> &userDisabledChecks) const;
     RegisteredFixIt::List availableFixIts(const std::string &checkName) const;
 
 
     /**
      * Returns all the requested checks.
      * This is a union of the requested checks via env variable and via arguments passed to compiler
      */
     RegisteredCheck::List requestedChecks(const ClazyContext *context, std::vector<std::string> &args);
     std::vector<std::pair<CheckBase*, RegisteredCheck>> createChecks(const RegisteredCheck::List &requestedChecks, ClazyContext *context);
 
     static void removeChecksFromList(RegisteredCheck::List &list, std::vector<std::string> &checkNames);
 
 private:
     CheckManager();
     static std::mutex m_lock;
 
     void registerChecks();
     void registerFixIt(int id, const std::string &fititName, const std::string &checkName);
     void registerCheck(const RegisteredCheck &check);
     bool checkExists(const std::string &name) const;
     RegisteredCheck::List checksForLevel(int level) const;
     CheckBase* createCheck(const std::string &name, ClazyContext *context);
     std::string checkNameForFixIt(const std::string &) const;
     RegisteredCheck::List m_registeredChecks;
     std::unordered_map<std::string, std::vector<RegisteredFixIt>> m_fixitsByCheckName;
     std::unordered_map<std::string, RegisteredFixIt > m_fixitByName;
 };
 
 #endif