Refined c++11 handling