Some minor non invasive changes for C++11