Take two on C++14