Replaced the for loop to look for the "raw" modifier with a std::find_if and a lambda