Ran contrib/bin/reindent.sh on header files.
Ran contrib/bin/reindent.sh on source files.
Why use std::find() on a std::set()?