Make CPP11 features more robust