Dropped dependency on C++11